Merge branch 'release/debian/0.28.4-1'debian/0.28.4-1

author: Jörg Frings-Fürst <debian@jff.email> 2018-08-05 08:00:12 +0200
committer: Jörg Frings-Fürst <debian@jff.email> 2018-08-05 08:00:12 +0200
commit: 8ae550d463720d5d1c0e253af29843ff15de1a54 (patch)
tree: b6be28a7d546e7a174910ee83d6af555ed8860fa
parent: 709e2d6f5652ec90c194a4ec2b530bebc6f952cb (diff)
parent: 9df0619e4e581eac73e5f3b76d271f1fff192f81 (diff)
30 files changed, 5383 insertions, 5886 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a15174..c47ca6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,79 @@
+commit 921ff14cdaf58f804ab1f5a2f9abd15ee5ffa19c
+Author: Jens Georg <mail@jensge.org>
+Date:   Sat Jul 14 13:06:00 2018 +0200
+
+    Prepare Shotwell 0.28.4
+
+M	NEWS
+M	configure.ac
+M	meson.build
+
+commit ce6d50975ffd7741f4b30a1b144e02eb4e868da9
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Jun 28 22:36:38 2018 +0200
+
+    camera: Temporarily remove libusb work-around
+
+    Work-around for !4 - unbreaking PTP support for most users is probably
+    more important than catering this somewhat obscure
+    (obsolete?) behavior
+
+M	src/camera/CameraTable.vala
+
+commit 9e12fe7a5af9eda05d8c5e6d0f771b1c8021d18d
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Jun 28 22:03:56 2018 +0200
+
+    camera: Add mtp to supported mount schemes
+
+    This allows automatic unmounting of MTP devices.
+
+M	src/library/LibraryWindow.vala
+
+commit 91f755dafd82d53aa0e2753fcfc8eedd8fce8918
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Tue Jun 5 15:24:46 2018 +0200
+
+    Fix keywords in Turkish translation
+
+
+    (cherry picked from commit 64c40c6f0fe4558ec1bab4851cc771991593adda)
+
+M	po/tr.po
+
+commit 5bb67119597371a34b6de52e7633082919a981cf
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Jun 8 11:31:59 2018 +0200
+
+    google: Fix OAuth2 token extraction
+
+    The old code parsed the page title which previously was the URI. That
+    seems to have changed lately to be empty.
+
+    Use proper OAuth2 redirect_uri and handle the custom Scheme just
+    like in
+    Flickr for OAuth1.
+
+    Closes #12
+
+M	plugins/authenticator/shotwell/GoogleAuthenticator.vala
+
+commit 4d55d976d0d458de0770616b934b3deace519c0f
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed May 23 23:29:43 2018 +0200
+
+    Fix slideshow settings dialog
+
+    - Missing response codes for buttons
+    - Wrong template class name
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=796370
+
+M	ui/slideshow_settings.ui
+
 commit cacc8bd5415d978f2eb64f215e4be696290c6edc
 Author: Jens Georg <mail@jensge.org>
-Date:   Mon May 7 19:37:12 2018 +0200
+Date:	Mon May 7 19:37:12 2018 +0200
 
     Prepare 0.28.3
 
diff --git a/Makefile.in b/Makefile.in
index 0421edf..e5b4a04 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6238,15 +6238,6 @@ thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.ob
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='thumbnailer/shotwell-video-thumbnailer.c' object='thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thumbnailer_shotwell_video_thumbnailer_CFLAGS) $(CFLAGS) -c -o thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.obj `if test -f 'thumbnailer/shotwell-video-thumbnailer.c'; then $(CYGPATH_W) 'thumbnailer/shotwell-video-thumbnailer.c'; else $(CYGPATH_W) '$(srcdir)/thumbnailer/shotwell-video-thumbnailer.c'; fi`
-$(srcdir)/src/graphics-processor.c: $(srcdir)/src_shotwell_graphics_processor_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/src_shotwell_graphics_processor_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_shotwell_graphics_processor_vala.stamp; \
-	fi
-$(srcdir)/src_shotwell_graphics_processor_vala.stamp: src/graphics-processor.vala src/shotwell-graphics-processor.vapi
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_shotwell_graphics_processor_VALAFLAGS) $(VALAFLAGS) -C src/graphics-processor.vala src/shotwell-graphics-processor.vapi
-	$(AM_V_at)mv -f $@-t $@
 $(srcdir)/src/unit/Unit.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
@@ -7246,6 +7237,15 @@ $(srcdir)/shotwell_vala.stamp: src/unit/Unit.vala src/util/Util.vala src/util/fi
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
 	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(shotwell_VALAFLAGS) $(VALAFLAGS) -C src/unit/Unit.vala src/util/Util.vala src/util/file.vala src/util/image.vala src/util/misc.vala src/util/string.vala src/util/system.vala src/util/ui.vala src/threads/Threads.vala src/threads/Workers.vala src/threads/BackgroundJob.vala src/threads/Semaphore.vala src/db/Db.vala src/db/DatabaseTable.vala src/db/PhotoTable.vala src/db/EventTable.vala src/db/TagTable.vala src/db/TombstoneTable.vala src/db/VideoTable.vala src/db/VersionTable.vala src/db/SavedSearchDBTable.vala src/dialogs/Preferences.vala src/dialogs/EntryMultiCompletion.vala src/dialogs/ExportDialog.vala src/dialogs/TextEntry.vala src/dialogs/WelcomeDialog.vala src/dialogs/MultiTextEntryDialog.vala src/dialogs/AdjustDateTimeDialog.vala src/dialogs/SetBackground.vala src/dialogs/ProgressDialog.vala src/dialogs/SetBackgroundSlideshow.vala src/editing_tools/EditingTools.vala src/editing_tools/RGBHistogramManipulator.vala src/editing_tools/StraightenTool.vala src/slideshow/Slideshow.vala src/slideshow/TransitionEffects.vala src/photos/Photos.vala src/photos/PhotoFileAdapter.vala src/photos/PhotoFileFormat.vala src/photos/PhotoFileSniffer.vala src/photos/PhotoMetadata.vala src/photos/GRaw.vala src/photos/GdkSupport.vala src/photos/JfifSupport.vala src/photos/BmpSupport.vala src/photos/RawSupport.vala src/photos/PngSupport.vala src/photos/TiffSupport.vala src/plugins/Plugins.vala src/plugins/StandardHostInterface.vala src/plugins/ManifestWidget.vala src/publishing/Publishing.vala src/publishing/PublishingUI.vala src/publishing/PublishingPluginHost.vala src/publishing/APIGlue.vala src/library/Library.vala src/library/LibraryWindow.vala src/library/LibraryBranch.vala src/library/TrashSidebarEntry.vala src/library/OfflineSidebarEntry.vala src/library/FlaggedSidebarEntry.vala src/library/LastImportSidebarEntry.vala src/library/ImportQueueSidebarEntry.vala src/library/FlaggedPage.vala src/library/ImportQueuePage.vala src/library/LastImportPage.vala src/library/OfflinePage.vala src/library/TrashPage.vala src/direct/Direct.vala src/direct/DirectWindow.vala src/direct/DirectPhoto.vala src/direct/DirectPhotoPage.vala src/direct/DirectView.vala src/core/Core.vala src/core/DataCollection.vala src/core/DataSet.vala src/core/util.vala src/core/SourceCollection.vala src/core/SourceHoldingTank.vala src/core/DatabaseSourceCollection.vala src/core/ContainerSourceCollection.vala src/core/ViewCollection.vala src/core/DataObject.vala src/core/Alteration.vala src/core/DataSource.vala src/core/DataSourceTypes.vala src/core/DataView.vala src/core/DataViewTypes.vala src/core/Tracker.vala src/core/SourceInterfaces.vala src/sidebar/Sidebar.vala src/sidebar/Branch.vala src/sidebar/Entry.vala src/sidebar/Tree.vala src/sidebar/common.vala src/events/Events.vala src/events/EventsBranch.vala src/events/EventsDirectoryPage.vala src/events/EventPage.vala src/events/EventDirectoryItem.vala src/tags/Tags.vala src/tags/TagsBranch.vala src/tags/TagPage.vala src/tags/HierarchicalTagIndex.vala src/tags/HierarchicalTagUtilities.vala src/camera/Camera.vala src/camera/CameraBranch.vala src/camera/CameraTable.vala src/camera/GPhoto.vala src/camera/ImportPage.vala src/searches/Searches.vala src/searches/SearchesBranch.vala src/searches/SearchBoolean.vala src/searches/SavedSearchPage.vala src/searches/SavedSearchDialog.vala src/config/Config.vala src/config/ConfigurationInterfaces.vala src/config/GSettingsEngine.vala src/data_imports/DataImports.vala src/data_imports/DataImportsPluginHost.vala src/data_imports/DataImportsUI.vala src/data_imports/DataImportJob.vala src/data_imports/DataImportSource.vala src/folders/Folders.vala src/folders/FoldersBranch.vala src/folders/FoldersPage.vala src/main.vala src/AppWindow.vala src/CollectionPage.vala src/NaturalCollate.vala src/Thumbnail.vala src/ThumbnailCache.vala src/CheckerboardLayout.vala src/PhotoPage.vala src/Page.vala src/SortedList.vala src/Dimensions.vala src/Box.vala src/Photo.vala src/Orientation.vala src/BatchImport.vala src/Dialogs.vala src/Resources.vala src/Debug.vala src/Properties.vala src/Event.vala src/International.vala src/AppDirs.vala src/PixbufCache.vala src/CommandManager.vala src/Commands.vala src/SlideshowPage.vala src/LibraryFiles.vala src/Printing.vala src/Tag.vala src/Screensaver.vala src/Exporter.vala src/DirectoryMonitor.vala src/LibraryMonitor.vala src/VideoSupport.vala src/Tombstone.vala src/MetadataWriter.vala src/Application.vala src/TimedQueue.vala src/MediaPage.vala src/MediaDataRepresentation.vala src/DesktopIntegration.vala src/MediaInterfaces.vala src/MediaMetadata.vala src/VideoMetadata.vala src/MediaMonitor.vala src/PhotoMonitor.vala src/VideoMonitor.vala src/SearchFilter.vala src/MediaViewTracker.vala src/UnityProgressBar.vala src/Upgrades.vala src/.unitize/_UnitInternals.vala src/.unitize/_UtilInternals.vala src/.unitize/_ThreadsInternals.vala src/.unitize/_DbInternals.vala src/.unitize/_EditingToolsInternals.vala src/.unitize/_PluginsInternals.vala src/.unitize/_SlideshowInternals.vala src/.unitize/_PhotosInternals.vala src/.unitize/_PublishingInternals.vala src/.unitize/_LibraryInternals.vala src/.unitize/_DirectInternals.vala src/.unitize/_CoreInternals.vala src/.unitize/_SidebarInternals.vala src/.unitize/_EventsInternals.vala src/.unitize/_TagsInternals.vala src/.unitize/_CameraInternals.vala src/.unitize/_SearchesInternals.vala src/.unitize/_ConfigInternals.vala src/.unitize/_DataImportsInternals.vala src/.unitize/_FoldersInternals.vala src/.unitize/_Library_unitize_entry.vala src/.unitize/_Direct_unitize_entry.vala plugins/shotwell-plugin-dev-1.0.vapi src/shotwell-graphics-processor.vapi
 	$(AM_V_at)mv -f $@-t $@
+$(srcdir)/src/graphics-processor.c: $(srcdir)/src_shotwell_graphics_processor_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/src_shotwell_graphics_processor_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_shotwell_graphics_processor_vala.stamp; \
+	fi
+$(srcdir)/src_shotwell_graphics_processor_vala.stamp: src/graphics-processor.vala src/shotwell-graphics-processor.vapi
+	$(AM_V_at)rm -f $@ && echo stamp > $@-t
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_shotwell_graphics_processor_VALAFLAGS) $(VALAFLAGS) -C src/graphics-processor.vala src/shotwell-graphics-processor.vapi
+	$(AM_V_at)mv -f $@-t $@
 $(srcdir)/thumbnailer/shotwell-video-thumbnailer.c: $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; fi
 	@if test -f $@; then :; else \
@@ -7269,45 +7269,6 @@ $(srcdir)/src_libgraphics_processor_la_vala.stamp: src/ColorTransformation.vala
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
 	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_libgraphics_processor_la_VALAFLAGS) $(VALAFLAGS) -C src/ColorTransformation.vala src/util/KeyValueMap.vala
 	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/plugins/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/TumblrPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(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/TumblrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi plugins/authenticator/shotwell-authenticator.vapi vapi/libgdata.vapi
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/TumblrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi plugins/authenticator/shotwell-authenticator.vapi vapi/libgdata.vapi
-	$(AM_V_at)mv -f $@-t $@
 $(srcdir)/plugins/common/RESTSupport.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
 	@if test -f $@; then :; else \
@@ -7337,39 +7298,68 @@ $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp: plugins/common
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
 	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_common_libshotwell_plugin_common_la_VALAFLAGS) $(VALAFLAGS) -C plugins/common/RESTSupport.vala plugins/common/OAuth1Support.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/common/BuilderPane.vala plugins/shotwell-plugin-dev-1.0.vapi
 	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
+$(srcdir)/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_authenticator_libshotwell_authenticator_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(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
+$(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_authenticator_libshotwell_authenticator_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(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
+$(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_authenticator_libshotwell_authenticator_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(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
+$(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_authenticator_libshotwell_authenticator_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/authenticator/shotwell/OAuth1Authenticator.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
+$(srcdir)/src_plugins_libplugin_la_vala.stamp: src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala
+	$(AM_V_at)rm -f $@ && echo stamp > $@-t
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_plugins_libplugin_la_VALAFLAGS) $(VALAFLAGS) -C src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala
+	$(AM_V_at)mv -f $@-t $@
+$(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_authenticator_libshotwell_authenticator_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/authenticator/shotwell/TumblrAuthenticator.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
+$(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_authenticator_libshotwell_authenticator_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
 	fi
-$(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp: plugins/shotwell-plugin-common.vapi plugins/shotwell-plugin-dev-1.0.vapi plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala plugins/authenticator/shotwell/GoogleAuthenticator.vala plugins/authenticator/shotwell/OAuth1Authenticator.vala plugins/authenticator/shotwell/TumblrAuthenticator.vala
+$(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/TumblrPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(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/TumblrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi plugins/authenticator/shotwell-authenticator.vapi vapi/libgdata.vapi
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_authenticator_libshotwell_authenticator_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-plugin-common.vapi plugins/shotwell-plugin-dev-1.0.vapi plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala plugins/authenticator/shotwell/GoogleAuthenticator.vala plugins/authenticator/shotwell/OAuth1Authenticator.vala plugins/authenticator/shotwell/TumblrAuthenticator.vala
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/TumblrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi plugins/authenticator/shotwell-authenticator.vapi vapi/libgdata.vapi
 	$(AM_V_at)mv -f $@-t $@
 $(srcdir)/plugins/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
@@ -7430,29 +7420,39 @@ $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugi
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
 	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
 	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/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/shotwell/OAuth1Authenticator.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/authenticator/shotwell/TumblrAuthenticator.c: $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
+	fi
+$(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp: plugins/shotwell-plugin-common.vapi plugins/shotwell-plugin-dev-1.0.vapi plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala plugins/authenticator/shotwell/GoogleAuthenticator.vala plugins/authenticator/shotwell/OAuth1Authenticator.vala plugins/authenticator/shotwell/TumblrAuthenticator.vala
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(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 plugins/authenticator/shotwell/OAuth1Authenticator.vala plugins/authenticator/shotwell/TumblrAuthenticator.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
diff --git a/NEWS b/NEWS
index 84eaa8e..0156cee 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+Shotwell 0.28.4 - 14 Jul 2018
+  * Fix slideshow settings dialog
+  * Fix Google login sequence
+  * Fix MTP device unmounting
+  * Work-around issue where PTP cameras would not be recognized anymore
+
+Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=796370
+ - https://gitlab.gnome.org/GNOME/shotwell/issues/12
+
+All contributors to this release:
+ - Jens Georg <mail@jensge.org>
+ - Piotr Drąg <piotrdrag@gmail.com>
+
+Added/updated translations
+ - tr, courtesy of Emin Tufan Çetin
+
 Shotwell 0.28.3 - 7 May 2018
   * Fix spacings in search toolbar
   * Fix "Out of memory" issues when scrolling through large collections
diff --git a/configure b/configure
index b56e71f..35254d5 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.28.3.
+# Generated by GNU Autoconf 2.69 for shotwell 0.28.4.
 #
 # 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.28.3'
-PACKAGE_STRING='shotwell 0.28.3'
+PACKAGE_VERSION='0.28.4'
+PACKAGE_STRING='shotwell 0.28.4'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell'
 PACKAGE_URL=''
 
@@ -1505,7 +1505,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures shotwell 0.28.3 to adapt to many kinds of systems.
+\`configure' configures shotwell 0.28.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1576,7 +1576,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shotwell 0.28.3:";;
+     short | recursive ) echo "Configuration of shotwell 0.28.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1750,7 +1750,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shotwell configure 0.28.3
+shotwell configure 0.28.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2028,7 +2028,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by shotwell $as_me 0.28.3, which was
+It was created by shotwell $as_me 0.28.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2489,12 +2489,12 @@ MAJOR_VERSION=0
 
 MINOR_VERSION=28
 
-MICRO_VERSION=3
+MICRO_VERSION=4
 
 API_VERSION=0
 
 
-GITVER=cacc8bd5415d978f2eb64f215e4be696290c6edc
+GITVER=921ff14cdaf58f804ab1f5a2f9abd15ee5ffa19c
 
 
  if test "x$GITVER" != "x"; then
@@ -2992,7 +2992,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='shotwell'
- VERSION='0.28.3'
+ VERSION='0.28.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17786,7 +17786,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by shotwell $as_me 0.28.3, which was
+This file was extended by shotwell $as_me 0.28.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17852,7 +17852,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-shotwell config.status 0.28.3
+shotwell config.status 0.28.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index bb37de5..872bf7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl Define Versioning Information
 dnl ***********************************************************************
 m4_define([major_version],[0])
 m4_define([minor_version],[28])
-m4_define([micro_version],[3])
+m4_define([micro_version],[4])
 m4_define([package_version],[major_version.minor_version.micro_version])
 m4_define([bug_report_url],[https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell])
 m4_define([api_version],[major_version])
diff --git a/debian/changelog b/debian/changelog
index 5696176..293005d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+shotwell (0.28.4-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 04 Aug 2018 14:40:03 +0200
+
 shotwell (0.28.3-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/files b/debian/files
deleted file mode 100644
index f95e7a0..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-shotwell_0.28.3-1_source.buildinfo gnome optional
diff --git a/meson.build b/meson.build
index 9e01314..c3d8468 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('Shotwell', ['vala', 'c'],
-        version : '0.28.3',
+        version : '0.28.4',
         default_options : ['buildtype=debugoptimized'])
 
 gnome = import('gnome')
diff --git a/plugins/authenticator/shotwell/GoogleAuthenticator.c b/plugins/authenticator/shotwell/GoogleAuthenticator.c
index 644ee53..2b09bab 100644
--- a/plugins/authenticator/shotwell/GoogleAuthenticator.c
+++ b/plugins/authenticator/shotwell/GoogleAuthenticator.c
@@ -9,9 +9,10 @@
 #include <string.h>
 #include "shotwell-plugin-common.h"
 #include <webkit2/webkit2.h>
+#include <libsoup/soup.h>
+#include <gio/gio.h>
 #include "shotwell-plugin-dev-1.0.h"
 #include <glib/gi18n-lib.h>
-#include <libsoup/soup.h>
 #include <json-glib/json-glib.h>
 
 
@@ -30,9 +31,12 @@ enum  {
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES
 };
 static GParamSpec* publishing_authenticator_shotwell_google_web_authentication_pane_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_NUM_PROPERTIES];
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define __vala_SoupURI_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupURI_free (var), NULL)))
+#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_ERROR_SIGNAL,
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL,
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_NUM_SIGNALS
 };
@@ -97,7 +101,6 @@ enum  {
 	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_NUM_PROPERTIES
 };
 static GParamSpec* publishing_authenticator_shotwell_google_google_properties[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_NUM_PROPERTIES];
-#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)))
@@ -116,6 +119,10 @@ struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass {
 	ShotwellPluginsCommonWebAuthenticationPaneClass parent_class;
 };
 
+struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate {
+	gchar* auth_code;
+};
+
 struct _PublishingAuthenticatorShotwellGoogleSession {
 	PublishingRESTSupportSession parent_instance;
 	PublishingAuthenticatorShotwellGoogleSessionPrivate * priv;
@@ -186,13 +193,25 @@ static SpitPublishingAuthenticatorIface * publishing_authenticator_shotwell_goog
 
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_ID "534227538559-hvj2e8bj0vfv2f49r7gvjoq6jibfav67.apps.googleusercontent.c" \
 "om"
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REVERSE_CLIENT_ID "com.googleusercontent.apps.534227538559-hvj2e8bj0vfv2f49r7gvjoq6jibfav" \
+"67"
 #define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_SECRET "pwpzZ7W1TCcD5uIfYCu8sM7x"
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CALLBACK_URI PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REVERSE_CLIENT_ID ":/auth-callback"
 GType publishing_authenticator_shotwell_google_web_authentication_pane_get_type (void) G_GNUC_CONST;
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate))
+static void publishing_authenticator_shotwell_google_web_authentication_pane_real_constructed (GObject* base);
+static void publishing_authenticator_shotwell_google_web_authentication_pane_on_shotwell_auth_request_cb (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* self,
+                                                                                                   WebKitURISchemeRequest* request);
+static void _publishing_authenticator_shotwell_google_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback (WebKitURISchemeRequest* request,
+                                                                                                                                        gpointer self);
+static void publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
+static void _vala_SoupURI_free (SoupURI* self);
+static guint8* _vala_array_dup2 (guint8* self,
+                          int length);
 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;
 static gboolean publishing_authenticator_shotwell_google_session_real_is_authenticated (PublishingRESTSupportSession* base);
@@ -291,197 +310,56 @@ static void _publishing_authenticator_shotwell_google_google_on_service_welcome_
 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;
-#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"
-	self = (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*) g_object_new (object_type, "login-uri", auth_sequence_start_url, NULL);
-#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	return self;
-#line 305 "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 314 "GoogleAuthenticator.c"
-}
-
-
-gboolean
-publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty (void)
+static gpointer
+_g_object_ref0 (gpointer self)
 {
-	gboolean result = FALSE;
-	gboolean _tmp0_;
-#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 329 "GoogleAuthenticator.c"
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 317 "GoogleAuthenticator.c"
 }
 
 
-static gint
-string_index_of (const gchar* self,
-                 const gchar* needle,
-                 gint start_index)
+static void
+_publishing_authenticator_shotwell_google_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback (WebKitURISchemeRequest* request,
+                                                                                                                                   gpointer self)
 {
-	gint result = 0;
-	gchar* _result_ = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 1025 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 1025 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (needle != NULL, 0);
-#line 1026 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	_tmp0_ = strstr (((gchar*) self) + start_index, (gchar*) needle);
-#line 1026 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	_result_ = _tmp0_;
-#line 1028 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	_tmp1_ = _result_;
-#line 1028 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	if (_tmp1_ != NULL) {
-#line 354 "GoogleAuthenticator.c"
-		gchar* _tmp2_;
-#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp2_ = _result_;
-#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		result = (gint) (_tmp2_ - ((gchar*) self));
-#line 1029 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		return result;
-#line 362 "GoogleAuthenticator.c"
-	} else {
-#line 1031 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		result = -1;
-#line 1031 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		return result;
-#line 368 "GoogleAuthenticator.c"
-	}
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_web_authentication_pane_on_shotwell_auth_request_cb ((PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*) self, request);
+#line 327 "GoogleAuthenticator.c"
 }
 
 
-static glong
-string_strnlen (gchar* str,
-                glong maxlen)
+static void
+publishing_authenticator_shotwell_google_web_authentication_pane_real_constructed (GObject* base)
 {
-	glong result = 0L;
-	gchar* end = NULL;
-	gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	_tmp0_ = memchr (str, 0, (gsize) maxlen);
-#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	end = _tmp0_;
-#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	_tmp1_ = end;
-#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	if (_tmp1_ == NULL) {
-#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		result = maxlen;
-#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		return result;
-#line 393 "GoogleAuthenticator.c"
-	} else {
-		gchar* _tmp2_;
-#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp2_ = end;
-#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp2_ - str);
-#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		return result;
-#line 402 "GoogleAuthenticator.c"
-	}
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self;
+	WebKitWebContext* ctx = NULL;
+	WebKitWebContext* _tmp0_;
+	WebKitWebContext* _tmp1_;
+#line 16 "/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 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	G_OBJECT_CLASS (publishing_authenticator_shotwell_google_web_authentication_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane), G_TYPE_OBJECT, GObject));
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = webkit_web_context_get_default ();
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	ctx = _tmp1_;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	webkit_web_context_register_uri_scheme (ctx, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REVERSE_CLIENT_ID, _publishing_authenticator_shotwell_google_web_authentication_pane_on_shotwell_auth_request_cb_web_kit_uri_scheme_request_callback, g_object_ref (self), g_object_unref);
+#line 16 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_object_unref0 (ctx);
+#line 352 "GoogleAuthenticator.c"
 }
 
 
-static gchar*
-string_substring (const gchar* self,
-                  glong offset,
-                  glong len)
+static void
+_vala_SoupURI_free (SoupURI* self)
 {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gboolean _tmp0_ = FALSE;
-	glong _tmp6_;
-	gchar* _tmp7_;
-#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	if (offset >= ((glong) 0)) {
-#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp0_ = len >= ((glong) 0);
-#line 423 "GoogleAuthenticator.c"
-	} else {
-#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp0_ = FALSE;
-#line 427 "GoogleAuthenticator.c"
-	}
-#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		string_length = string_strnlen ((gchar*) self, offset + len);
-#line 433 "GoogleAuthenticator.c"
-	} else {
-		gint _tmp1_;
-		gint _tmp2_;
-#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp1_ = strlen (self);
-#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp2_;
-#line 443 "GoogleAuthenticator.c"
-	}
-#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	if (offset < ((glong) 0)) {
-#line 447 "GoogleAuthenticator.c"
-		glong _tmp3_;
-#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp3_ = string_length;
-#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		offset = _tmp3_ + offset;
-#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (offset >= ((glong) 0), NULL);
-#line 455 "GoogleAuthenticator.c"
-	} else {
-		glong _tmp4_;
-#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp4_ = string_length;
-#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (offset <= _tmp4_, NULL);
-#line 462 "GoogleAuthenticator.c"
-	}
-#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	if (len < ((glong) 0)) {
-#line 466 "GoogleAuthenticator.c"
-		glong _tmp5_;
-#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		_tmp5_ = string_length;
-#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-		len = _tmp5_ - offset;
-#line 472 "GoogleAuthenticator.c"
-	}
-#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	_tmp6_ = string_length;
-#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
-#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	_tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
-#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	result = _tmp7_;
-#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
-	return result;
-#line 484 "GoogleAuthenticator.c"
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_boxed_free (soup_uri_get_type (), self);
+#line 361 "GoogleAuthenticator.c"
 }
 
 
@@ -489,98 +367,288 @@ static void
 publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base)
 {
 	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self;
-	gchar* page_title = NULL;
+	SoupURI* uri = NULL;
 	WebKitWebView* _tmp0_;
 	WebKitWebView* _tmp1_;
 	const gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	const gchar* _tmp5_;
-#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	SoupURI* _tmp3_;
+	SoupURI* _tmp4_;
+	gboolean _tmp5_ = FALSE;
+	SoupURI* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp9_;
+#line 23 "/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"
+#line 24 "/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"
+#line 24 "/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"
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = webkit_web_view_get_uri (_tmp1_);
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp3_ = soup_uri_new (_tmp2_);
+#line 24 "/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"
-	if (string_index_of (_tmp5_, "state=connect", 0) > 0) {
-#line 519 "GoogleAuthenticator.c"
-		gint auth_code_field_start = 0;
-		const gchar* _tmp6_;
-		gint _tmp7_;
-		gchar* auth_code = NULL;
-		const gchar* _tmp8_;
-		gint _tmp9_;
-		gchar* _tmp10_;
-		const gchar* _tmp11_;
 #line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp6_ = page_title;
+	_g_object_unref0 (_tmp1_);
 #line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		auth_code_field_start = string_index_of (_tmp6_, "code=", 0);
+	uri = _tmp4_;
 #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp7_ = auth_code_field_start;
+	_tmp6_ = uri;
 #line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		if (_tmp7_ < 0) {
-#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			_g_free0 (page_title);
+	_tmp7_ = _tmp6_->scheme;
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (g_strcmp0 (_tmp7_, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REVERSE_CLIENT_ID) == 0) {
+#line 401 "GoogleAuthenticator.c"
+		const gchar* _tmp8_;
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp8_ = self->priv->auth_code;
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp5_ = _tmp8_ == NULL;
+#line 407 "GoogleAuthenticator.c"
+	} else {
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp5_ = FALSE;
+#line 411 "GoogleAuthenticator.c"
+	}
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp5_) {
 #line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-			return;
-#line 540 "GoogleAuthenticator.c"
-		}
-#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp8_ = page_title;
-#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp9_ = auth_code_field_start;
-#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_tmp10_ = string_substring (_tmp8_, (glong) (_tmp9_ + 5), (glong) -1);
-#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		auth_code = _tmp10_;
+		g_signal_emit (self, publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_ERROR_SIGNAL], 0);
+#line 417 "GoogleAuthenticator.c"
+	}
+#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp9_ = self->priv->auth_code;
+#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp9_ != NULL) {
+#line 423 "GoogleAuthenticator.c"
+		const gchar* _tmp10_;
+#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp10_ = self->priv->auth_code;
 #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"
-		_tmp11_ = auth_code;
-#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		g_signal_emit (self, publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL], 0, _tmp11_);
+		g_signal_emit (self, publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL], 0, _tmp10_);
+#line 429 "GoogleAuthenticator.c"
+	}
 #line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-		_g_free0 (auth_code);
-#line 558 "GoogleAuthenticator.c"
+	__vala_SoupURI_free0 (uri);
+#line 433 "GoogleAuthenticator.c"
+}
+
+
+static guint8*
+string_get_data (const gchar* self,
+                 int* result_length1)
+{
+	guint8* result;
+	guint8* res = NULL;
+	gint res_length1;
+	gint _res_size_;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	guint8* _tmp3_;
+	gint _tmp3__length1;
+	guint8* _tmp4_;
+	gint _tmp4__length1;
+#line 1442 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	res = (guint8*) self;
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	res_length1 = -1;
+#line 1443 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_res_size_ = res_length1;
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = strlen (self);
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp1_ = _tmp0_;
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	res_length1 = (gint) _tmp1_;
+#line 1444 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp2_ = res_length1;
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp3_ = res;
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp3__length1 = res_length1;
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp4_ = _tmp3_;
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp4__length1 = _tmp3__length1;
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (result_length1) {
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		*result_length1 = _tmp4__length1;
+#line 480 "GoogleAuthenticator.c"
 	}
-#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	_g_free0 (page_title);
-#line 562 "GoogleAuthenticator.c"
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp4_;
+#line 1445 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	return result;
+#line 486 "GoogleAuthenticator.c"
+}
+
+
+static guint8*
+_vala_array_dup2 (guint8* self,
+                  int length)
+{
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return g_memdup (self, length * sizeof (guint8));
+#line 496 "GoogleAuthenticator.c"
+}
+
+
+static void
+publishing_authenticator_shotwell_google_web_authentication_pane_on_shotwell_auth_request_cb (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* self,
+                                                                                              WebKitURISchemeRequest* request)
+{
+	SoupURI* uri = NULL;
+	const gchar* _tmp0_;
+	SoupURI* _tmp1_;
+	const gchar* _tmp2_;
+	GHashTable* form_data = NULL;
+	const gchar* _tmp3_;
+	GHashTable* _tmp4_;
+	gconstpointer _tmp5_;
+	gchar* _tmp6_;
+	gchar* response = NULL;
+	gchar* _tmp7_;
+	GMemoryInputStream* mins = NULL;
+	guint8* _tmp8_;
+	gint _tmp8__length1;
+	guint8* _tmp9_;
+	gint _tmp9__length1;
+	guint8* _tmp10_;
+	gint _tmp10__length1;
+	GMemoryInputStream* _tmp11_;
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_WEB_AUTHENTICATION_PANE (self));
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (WEBKIT_IS_URI_SCHEME_REQUEST (request));
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = webkit_uri_scheme_request_get_uri (request);
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = soup_uri_new (_tmp0_);
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	uri = _tmp1_;
+#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = webkit_uri_scheme_request_get_uri (request);
+#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:36: URI: %s", _tmp2_);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp3_ = uri->query;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = soup_form_decode (_tmp3_);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	form_data = _tmp4_;
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_ = g_hash_table_lookup (form_data, "code");
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp6_ = g_strdup ((const gchar*) _tmp5_);
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (self->priv->auth_code);
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->auth_code = _tmp6_;
+#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp7_ = g_strdup ("");
+#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	response = _tmp7_;
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp8_ = string_get_data (response, &_tmp8__length1);
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp9_ = _tmp8_;
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp9__length1 = _tmp8__length1;
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp10_ = (_tmp9_ != NULL) ? _vala_array_dup2 (_tmp9_, _tmp9__length1) : ((gpointer) _tmp9_);
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp10__length1 = _tmp9__length1;
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp11_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp10_, _tmp10__length1, NULL);
+#line 41 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	mins = _tmp11_;
+#line 42 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	webkit_uri_scheme_request_finish (request, G_TYPE_CHECK_INSTANCE_CAST (mins, g_input_stream_get_type (), GInputStream), (gint64) -1, "text/plain");
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_object_unref0 (mins);
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (response);
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_hash_table_unref0 (form_data);
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	__vala_SoupURI_free0 (uri);
+#line 579 "GoogleAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*
+publishing_authenticator_shotwell_google_web_authentication_pane_construct (GType object_type,
+                                                                            const gchar* auth_sequence_start_url)
+{
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self = NULL;
+#line 47 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_val_if_fail (auth_sequence_start_url != NULL, NULL);
+#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*) g_object_new (object_type, "login-uri", auth_sequence_start_url, NULL);
+#line 47 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return self;
+#line 594 "GoogleAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*
+publishing_authenticator_shotwell_google_web_authentication_pane_new (const gchar* auth_sequence_start_url)
+{
+#line 47 "/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 603 "GoogleAuthenticator.c"
+}
+
+
+gboolean
+publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty (void)
+{
+	gboolean result = FALSE;
+	gboolean _tmp0_;
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = publishing_authenticator_shotwell_google_web_authentication_pane_cache_dirty;
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	result = _tmp0_;
+#line 52 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return result;
+#line 618 "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"
+#line 10 "/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"
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate));
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	((GObjectClass *) klass)->constructed = (void (*) (GObject *)) publishing_authenticator_shotwell_google_web_authentication_pane_real_constructed;
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*) (ShotwellPluginsCommonWebAuthenticationPane *)) publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load;
-#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 10 "/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"
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_ERROR_SIGNAL] = g_signal_new ("error", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_web_authentication_pane_signals[PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_AUTHORIZED_SIGNAL] = 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 577 "GoogleAuthenticator.c"
+#line 639 "GoogleAuthenticator.c"
 }
 
 
 static void
 publishing_authenticator_shotwell_google_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self)
 {
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self);
+#line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->auth_code = NULL;
+#line 650 "GoogleAuthenticator.c"
 }
 
 
@@ -588,11 +656,13 @@ 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"
+#line 10 "/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"
+#line 12 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (self->priv->auth_code);
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	G_OBJECT_CLASS (publishing_authenticator_shotwell_google_web_authentication_pane_parent_class)->finalize (obj);
-#line 595 "GoogleAuthenticator.c"
+#line 664 "GoogleAuthenticator.c"
 }
 
 
@@ -616,34 +686,34 @@ publishing_authenticator_shotwell_google_session_real_is_authenticated (Publishi
 	PublishingAuthenticatorShotwellGoogleSession * self;
 	gboolean result = FALSE;
 	const gchar* _tmp0_;
-#line 42 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 61 "/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"
+#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = self->access_token;
-#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	result = _tmp0_ != NULL;
-#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 627 "GoogleAuthenticator.c"
+#line 696 "GoogleAuthenticator.c"
 }
 
 
 void
 publishing_authenticator_shotwell_google_session_deauthenticate (PublishingAuthenticatorShotwellGoogleSession* self)
 {
-#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 65 "/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"
+#line 66 "/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"
+#line 66 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->access_token = NULL;
-#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 67 "/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"
+#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->refresh_token = NULL;
-#line 49 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->expires_at = (gint64) -1;
-#line 646 "GoogleAuthenticator.c"
+#line 715 "GoogleAuthenticator.c"
 }
 
 
@@ -651,46 +721,46 @@ PublishingAuthenticatorShotwellGoogleSession*
 publishing_authenticator_shotwell_google_session_construct (GType object_type)
 {
 	PublishingAuthenticatorShotwellGoogleSession* self = NULL;
-#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 56 "/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"
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 658 "GoogleAuthenticator.c"
+#line 727 "GoogleAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellGoogleSession*
 publishing_authenticator_shotwell_google_session_new (void)
 {
-#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return publishing_authenticator_shotwell_google_session_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION);
-#line 667 "GoogleAuthenticator.c"
+#line 736 "GoogleAuthenticator.c"
 }
 
 
 static void
 publishing_authenticator_shotwell_google_session_class_init (PublishingAuthenticatorShotwellGoogleSessionClass * klass)
 {
-#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 56 "/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"
+#line 56 "/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"
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_authenticator_shotwell_google_session_real_is_authenticated;
-#line 680 "GoogleAuthenticator.c"
+#line 749 "GoogleAuthenticator.c"
 }
 
 
 static void
 publishing_authenticator_shotwell_google_session_instance_init (PublishingAuthenticatorShotwellGoogleSession * self)
 {
-#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->access_token = NULL;
-#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->refresh_token = NULL;
-#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->expires_at = (gint64) -1;
-#line 693 "GoogleAuthenticator.c"
+#line 762 "GoogleAuthenticator.c"
 }
 
 
@@ -698,15 +768,15 @@ static void
 publishing_authenticator_shotwell_google_session_finalize (PublishingRESTSupportSession * obj)
 {
 	PublishingAuthenticatorShotwellGoogleSession * self;
-#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 56 "/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"
+#line 57 "/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"
+#line 58 "/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"
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_authenticator_shotwell_google_session_parent_class)->finalize (obj);
-#line 709 "GoogleAuthenticator.c"
+#line 778 "GoogleAuthenticator.c"
 }
 
 
@@ -730,25 +800,25 @@ publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct
                                                                                   const gchar* auth_code)
 {
 	PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* self = NULL;
-#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 75 "/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"
+#line 75 "/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"
+#line 76 "/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 (session, 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"
+#line 78 "/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", auth_code);
-#line 60 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 79 "/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"
+#line 80 "/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"
+#line 81 "/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", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CALLBACK_URI);
+#line 82 "/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"
+#line 75 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 751 "GoogleAuthenticator.c"
+#line 820 "GoogleAuthenticator.c"
 }
 
 
@@ -756,18 +826,18 @@ 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"
+#line 75 "/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 761 "GoogleAuthenticator.c"
+#line 830 "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"
+#line 72 "/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 770 "GoogleAuthenticator.c"
+#line 839 "GoogleAuthenticator.c"
 }
 
 
@@ -797,41 +867,41 @@ publishing_authenticator_shotwell_google_refresh_access_token_transaction_constr
 {
 	PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* self = NULL;
 	const gchar* _tmp0_;
-#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 89 "/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"
+#line 90 "/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 (session, 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"
+#line 92 "/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"
+#line 93 "/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"
+#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = session->refresh_token;
-#line 75 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 94 "/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", _tmp0_);
-#line 76 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 95 "/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"
+#line 89 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 816 "GoogleAuthenticator.c"
+#line 885 "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"
+#line 89 "/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 825 "GoogleAuthenticator.c"
+#line 894 "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"
+#line 86 "/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 834 "GoogleAuthenticator.c"
+#line 903 "GoogleAuthenticator.c"
 }
 
 
@@ -863,41 +933,41 @@ publishing_authenticator_shotwell_google_username_fetch_transaction_construct (G
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
 	gchar* _tmp2_;
-#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 101 "/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"
+#line 102 "/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 (session, 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"
+#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = session->access_token;
-#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp1_ = g_strconcat ("Bearer ", _tmp0_, NULL);
-#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = _tmp1_;
-#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 103 "/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", _tmp2_);
-#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp2_);
-#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 882 "GoogleAuthenticator.c"
+#line 951 "GoogleAuthenticator.c"
 }
 
 
 PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction*
 publishing_authenticator_shotwell_google_username_fetch_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session)
 {
-#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 101 "/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 891 "GoogleAuthenticator.c"
+#line 960 "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"
+#line 99 "/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 900 "GoogleAuthenticator.c"
+#line 969 "GoogleAuthenticator.c"
 }
 
 
@@ -921,30 +991,21 @@ publishing_authenticator_shotwell_google_username_fetch_transaction_get_type (vo
 }
 
 
-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 929 "GoogleAuthenticator.c"
-}
-
-
 static void
 _g_free0_ (gpointer var)
 {
-#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	var = (g_free (var), NULL);
-#line 938 "GoogleAuthenticator.c"
+#line 998 "GoogleAuthenticator.c"
 }
 
 
 static void
 _g_variant_unref0_ (gpointer var)
 {
-#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
-#line 947 "GoogleAuthenticator.c"
+#line 1007 "GoogleAuthenticator.c"
 }
 
 
@@ -962,51 +1023,51 @@ publishing_authenticator_shotwell_google_google_construct (GType object_type,
 	gchar* _tmp4_;
 	PublishingAuthenticatorShotwellGoogleSession* _tmp5_;
 	gchar* _tmp6_;
-#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 115 "/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"
+#line 115 "/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"
+#line 115 "/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"
+#line 115 "/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"
+#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = _g_object_ref0 (host);
-#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 118 "/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"
+#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->priv->host = _tmp0_;
-#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp1_ = g_str_hash;
-#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = g_str_equal;
-#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp3_ = g_hash_table_new_full (_tmp1_, _tmp2_, _g_free0_, _g_variant_unref0_);
-#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 119 "/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"
+#line 119 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->priv->params = _tmp3_;
-#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp4_ = g_strdup (scope);
-#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 120 "/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"
+#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->priv->scope = _tmp4_;
-#line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp5_ = publishing_authenticator_shotwell_google_session_new ();
-#line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 121 "/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"
+#line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->priv->session = _tmp5_;
-#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp6_ = g_strdup (welcome_message);
-#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 122 "/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"
+#line 122 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->priv->welcome_message = _tmp6_;
-#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 115 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self;
-#line 1009 "GoogleAuthenticator.c"
+#line 1069 "GoogleAuthenticator.c"
 }
 
 
@@ -1015,9 +1076,9 @@ 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"
+#line 115 "/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 1020 "GoogleAuthenticator.c"
+#line 1080 "GoogleAuthenticator.c"
 }
 
 
@@ -1030,72 +1091,72 @@ publishing_authenticator_shotwell_google_google_real_authenticate (SpitPublishin
 	gchar* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	const gchar* _tmp3_;
-#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 125 "/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"
+#line 126 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = self->priv->host;
-#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 126 "/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"
+#line 126 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	refresh_token = _tmp1_;
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp3_ = refresh_token;
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp3_ != NULL) {
-#line 1045 "GoogleAuthenticator.c"
+#line 1105 "GoogleAuthenticator.c"
 		const gchar* _tmp4_;
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp4_ = refresh_token;
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") != 0;
-#line 1051 "GoogleAuthenticator.c"
+#line 1111 "GoogleAuthenticator.c"
 	} else {
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp2_ = FALSE;
-#line 1055 "GoogleAuthenticator.c"
+#line 1115 "GoogleAuthenticator.c"
 	}
-#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp2_) {
-#line 1059 "GoogleAuthenticator.c"
+#line 1119 "GoogleAuthenticator.c"
 		const gchar* _tmp5_;
-#line 109 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp5_ = refresh_token;
-#line 109 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 128 "/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"
+#line 129 "/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"
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (refresh_token);
-#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1071 "GoogleAuthenticator.c"
+#line 1131 "GoogleAuthenticator.c"
 	}
-#line 115 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty ()) {
-#line 1075 "GoogleAuthenticator.c"
+#line 1135 "GoogleAuthenticator.c"
 		SpitPublishingPluginHost* _tmp6_;
 		SpitPublishingPluginHost* _tmp7_;
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp6_ = self->priv->host;
-#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		spit_publishing_plugin_host_set_service_locked (_tmp6_, FALSE);
-#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp7_ = self->priv->host;
-#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _ ("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."), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1086 "GoogleAuthenticator.c"
+#line 1146 "GoogleAuthenticator.c"
 	} else {
-#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (self);
-#line 1090 "GoogleAuthenticator.c"
+#line 1150 "GoogleAuthenticator.c"
 	}
-#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (refresh_token);
-#line 1094 "GoogleAuthenticator.c"
+#line 1154 "GoogleAuthenticator.c"
 }
 
 
@@ -1104,22 +1165,22 @@ publishing_authenticator_shotwell_google_google_real_can_logout (SpitPublishingA
 {
 	PublishingAuthenticatorShotwellGoogleGoogle * self;
 	gboolean result = FALSE;
-#line 124 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 143 "/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"
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	result = TRUE;
-#line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 1109 "GoogleAuthenticator.c"
+#line 1169 "GoogleAuthenticator.c"
 }
 
 
 static gpointer
 _g_hash_table_ref0 (gpointer self)
 {
-#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 148 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self ? g_hash_table_ref (self) : NULL;
-#line 1118 "GoogleAuthenticator.c"
+#line 1178 "GoogleAuthenticator.c"
 }
 
 
@@ -1130,17 +1191,17 @@ publishing_authenticator_shotwell_google_google_real_get_authentication_paramete
 	GHashTable* result = NULL;
 	GHashTable* _tmp0_;
 	GHashTable* _tmp1_;
-#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 147 "/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"
+#line 148 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = self->priv->params;
-#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 148 "/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"
+#line 148 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	result = _tmp1_;
-#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 148 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 1139 "GoogleAuthenticator.c"
+#line 1199 "GoogleAuthenticator.c"
 }
 
 
@@ -1150,17 +1211,17 @@ publishing_authenticator_shotwell_google_google_real_logout (SpitPublishingAuthe
 	PublishingAuthenticatorShotwellGoogleGoogle * self;
 	PublishingAuthenticatorShotwellGoogleSession* _tmp0_;
 	SpitPublishingPluginHost* _tmp1_;
-#line 132 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 151 "/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"
+#line 152 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = self->priv->session;
-#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 152 "/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"
+#line 153 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp1_ = self->priv->host;
-#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 153 "/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 1159 "GoogleAuthenticator.c"
+#line 1219 "GoogleAuthenticator.c"
 }
 
 
@@ -1168,9 +1229,9 @@ static void
 publishing_authenticator_shotwell_google_google_real_refresh (SpitPublishingAuthenticator* base)
 {
 	PublishingAuthenticatorShotwellGoogleGoogle * self;
-#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
-#line 1169 "GoogleAuthenticator.c"
+#line 1229 "GoogleAuthenticator.c"
 }
 
 
@@ -1179,9 +1240,9 @@ _publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized_pub
                                                                                                                                                           const gchar* auth_code,
                                                                                                                                                           gpointer self)
 {
-#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized ((PublishingAuthenticatorShotwellGoogleGoogle*) self, auth_code);
-#line 1180 "GoogleAuthenticator.c"
+#line 1240 "GoogleAuthenticator.c"
 }
 
 
@@ -1220,110 +1281,110 @@ publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (Pu
 	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp28_;
 	SpitPublishingPluginHost* _tmp29_;
 	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp30_;
-#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 160 "/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" \
+#line 161 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:161: 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"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = soup_uri_encode (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CALLBACK_URI, NULL);
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp1_ = _tmp0_;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/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"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp3_ = _tmp2_;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/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"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp5_ = _tmp4_;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/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"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp7_ = _tmp6_;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp8_ = self->priv->scope;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/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"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp10_ = _tmp9_;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/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"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp12_ = _tmp11_;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/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"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp14_ = _tmp13_;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/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"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp16_ = _tmp15_;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/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"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp18_ = _tmp17_;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/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"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp20_ = _tmp19_;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/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"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp22_ = _tmp21_;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/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"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp24_ = _tmp23_;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/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"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp26_ = _tmp25_;
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp24_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp22_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp20_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp18_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp16_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp14_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp12_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp10_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp7_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp5_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp3_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp1_);
-#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	user_authorization_url = _tmp26_;
-#line 154 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 173 "/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"
+#line 173 "/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"
+#line 173 "/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"
+#line 174 "/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"
+#line 174 "/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"
+#line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp29_ = self->priv->host;
-#line 157 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 176 "/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"
+#line 176 "/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"
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (user_authorization_url);
-#line 1321 "GoogleAuthenticator.c"
+#line 1381 "GoogleAuthenticator.c"
 }
 
 
@@ -1334,24 +1395,24 @@ publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized (Pub
 	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp0_;
 	guint _tmp1_;
 	const gchar* _tmp2_;
-#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 179 "/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"
+#line 179 "/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"
+#line 180 "/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"
+#line 180 "/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"
+#line 180 "/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"
+#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = self->priv->scope;
-#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
-	g_debug ("GoogleAuthenticator.vala:163: EVENT: user authorized scope %s with aut" \
+#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:182: EVENT: user authorized scope %s with aut" \
 "h_code %s", _tmp2_, auth_code);
-#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_do_get_access_tokens (self, auth_code);
-#line 1348 "GoogleAuthenticator.c"
+#line 1408 "GoogleAuthenticator.c"
 }
 
 
@@ -1359,9 +1420,9 @@ 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"
+#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
-#line 1358 "GoogleAuthenticator.c"
+#line 1418 "GoogleAuthenticator.c"
 }
 
 
@@ -1370,9 +1431,9 @@ _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publ
                                                                                                                                GError* err,
                                                                                                                                gpointer self)
 {
-#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_get_access_tokens_error ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender, err);
-#line 1369 "GoogleAuthenticator.c"
+#line 1429 "GoogleAuthenticator.c"
 }
 
 
@@ -1385,47 +1446,47 @@ publishing_authenticator_shotwell_google_google_do_get_access_tokens (Publishing
 	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
 	PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 187 "/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"
+#line 187 "/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" \
+#line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:188: ACTION: exchanging authorization code fo" \
 "r access & refresh tokens");
-#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = self->priv->host;
-#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 190 "/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"
+#line 192 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp1_ = self->priv->session;
-#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (_tmp1_, auth_code);
-#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	tokens_txn = _tmp2_;
-#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 193 "/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"
+#line 194 "/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 1402 "GoogleAuthenticator.c"
+#line 1462 "GoogleAuthenticator.c"
 	{
-#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 197 "/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"
+#line 197 "/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"
+#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1410 "GoogleAuthenticator.c"
+#line 1470 "GoogleAuthenticator.c"
 				goto __catch3_spit_publishing_publishing_error;
 			}
-#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 197 "/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"
+#line 197 "/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"
+#line 197 "/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"
+#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			return;
-#line 1421 "GoogleAuthenticator.c"
+#line 1481 "GoogleAuthenticator.c"
 		}
 	}
 	goto __finally3;
@@ -1434,36 +1495,36 @@ publishing_authenticator_shotwell_google_google_do_get_access_tokens (Publishing
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp3_;
 		GError* _tmp4_;
-#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		err = _inner_error_;
-#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_inner_error_ = NULL;
-#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp3_ = self->priv->host;
-#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp4_ = err;
-#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
-#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (err);
-#line 1442 "GoogleAuthenticator.c"
+#line 1502 "GoogleAuthenticator.c"
 	}
 	__finally3:
-#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 196 "/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"
+#line 196 "/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"
+#line 196 "/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"
+#line 196 "/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"
+#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1455 "GoogleAuthenticator.c"
+#line 1515 "GoogleAuthenticator.c"
 	}
-#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 187 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 1459 "GoogleAuthenticator.c"
+#line 1519 "GoogleAuthenticator.c"
 }
 
 
@@ -1475,30 +1536,30 @@ publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete (P
 	guint _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
-#line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 203 "/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"
+#line 203 "/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"
+#line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
-#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 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"
+#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (txn, 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_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" \
+#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:207: %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"
+#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
-#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp3_ = _tmp2_;
-#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp3_);
-#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp3_);
-#line 1493 "GoogleAuthenticator.c"
+#line 1553 "GoogleAuthenticator.c"
 }
 
 
@@ -1512,41 +1573,41 @@ publishing_authenticator_shotwell_google_google_on_get_access_tokens_error (Publ
 	gchar* _tmp2_;
 	gchar* _tmp3_;
 	SpitPublishingPluginHost* _tmp4_;
-#line 194 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 213 "/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"
+#line 213 "/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"
+#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
-#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 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"
+#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (txn, 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_error_publishing_rest_support_transaction_network_error, self);
-#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
-#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp3_ = _tmp2_;
-#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 218 "/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'", _tmp3_);
-#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp3_);
-#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp4_ = self->priv->host;
-#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	spit_publishing_plugin_host_post_error (_tmp4_, err);
-#line 1531 "GoogleAuthenticator.c"
+#line 1591 "GoogleAuthenticator.c"
 }
 
 
 static gpointer
 _json_object_ref0 (gpointer self)
 {
-#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return self ? json_object_ref (self) : NULL;
-#line 1540 "GoogleAuthenticator.c"
+#line 1600 "GoogleAuthenticator.c"
 }
 
 
@@ -1567,27 +1628,27 @@ publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAut
 	JsonObject* _tmp23_;
 	JsonObject* _tmp29_;
 	GError * _inner_error_ = NULL;
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 224 "/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"
+#line 224 "/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" \
+#line 225 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:225: ACTION: extracting OAuth tokens from bod" \
 "y of server response");
-#line 208 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = json_parser_new ();
-#line 208 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	parser = _tmp0_;
-#line 1571 "GoogleAuthenticator.c"
+#line 1631 "GoogleAuthenticator.c"
 	{
 		JsonParser* _tmp1_;
-#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp1_ = parser;
-#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		json_parser_load_from_data (_tmp1_, response_body, (gssize) -1, &_inner_error_);
-#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1580 "GoogleAuthenticator.c"
+#line 1640 "GoogleAuthenticator.c"
 			goto __catch4_g_error;
 		}
 	}
@@ -1602,198 +1663,198 @@ publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAut
 		gchar* _tmp6_;
 		GError* _tmp7_;
 		GError* _tmp8_;
-#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		err = _inner_error_;
-#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_inner_error_ = NULL;
-#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp2_ = self->priv->host;
-#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp3_ = err;
-#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp4_ = _tmp3_->message;
-#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp5_ = g_strconcat ("Couldn't parse JSON response: ", _tmp4_, NULL);
-#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp6_ = _tmp5_;
-#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp6_);
-#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp8_ = _tmp7_;
-#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		spit_publishing_plugin_host_post_error (_tmp2_, _tmp8_);
-#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (_tmp8_);
-#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (_tmp6_);
-#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (err);
-#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_object_unref0 (parser);
-#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1625 "GoogleAuthenticator.c"
+#line 1685 "GoogleAuthenticator.c"
 	}
 	__finally4:
-#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 229 "/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"
+#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_object_unref0 (parser);
-#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 229 "/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"
+#line 229 "/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"
+#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1638 "GoogleAuthenticator.c"
+#line 1698 "GoogleAuthenticator.c"
 	}
-#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp9_ = parser;
-#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp10_ = json_parser_get_root (_tmp9_);
-#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp11_ = json_node_get_object (_tmp10_);
-#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp12_ = _json_object_ref0 (_tmp11_);
-#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	response_obj = _tmp12_;
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp14_ = response_obj;
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (!json_object_has_member (_tmp14_, "access_token")) {
-#line 1654 "GoogleAuthenticator.c"
+#line 1714 "GoogleAuthenticator.c"
 		JsonObject* _tmp15_;
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp15_ = response_obj;
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp13_ = !json_object_has_member (_tmp15_, "refresh_token");
-#line 1660 "GoogleAuthenticator.c"
+#line 1720 "GoogleAuthenticator.c"
 	} else {
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp13_ = FALSE;
-#line 1664 "GoogleAuthenticator.c"
+#line 1724 "GoogleAuthenticator.c"
 	}
-#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp13_) {
-#line 1668 "GoogleAuthenticator.c"
+#line 1728 "GoogleAuthenticator.c"
 		SpitPublishingPluginHost* _tmp16_;
 		GError* _tmp17_;
 		GError* _tmp18_;
-#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp16_ = self->priv->host;
-#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp17_ = 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"
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp18_ = _tmp17_;
-#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		spit_publishing_plugin_host_post_error (_tmp16_, _tmp18_);
-#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (_tmp18_);
-#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 242 "/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"
+#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_object_unref0 (parser);
-#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1688 "GoogleAuthenticator.c"
+#line 1748 "GoogleAuthenticator.c"
 	}
-#line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp19_ = response_obj;
-#line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (json_object_has_member (_tmp19_, "expires_in")) {
-#line 1694 "GoogleAuthenticator.c"
+#line 1754 "GoogleAuthenticator.c"
 		gint64 duration = 0LL;
 		JsonObject* _tmp20_;
 		gint64 abs_time = 0LL;
 		gint64 _tmp21_;
 		gint64 _tmp22_;
-#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp20_ = response_obj;
-#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		duration = json_object_get_int_member (_tmp20_, "expires_in");
-#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp21_ = duration;
-#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		abs_time = g_get_real_time () + ((_tmp21_ * 1000L) * 1000L);
-#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp22_ = abs_time;
-#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (self, _tmp22_);
-#line 1712 "GoogleAuthenticator.c"
+#line 1772 "GoogleAuthenticator.c"
 	}
-#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp23_ = response_obj;
-#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (json_object_has_member (_tmp23_, "refresh_token")) {
-#line 1718 "GoogleAuthenticator.c"
+#line 1778 "GoogleAuthenticator.c"
 		gchar* refresh_token = NULL;
 		JsonObject* _tmp24_;
 		const gchar* _tmp25_;
 		gchar* _tmp26_;
 		const gchar* _tmp27_;
-#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp24_ = response_obj;
-#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp25_ = json_object_get_string_member (_tmp24_, "refresh_token");
-#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp26_ = g_strdup (_tmp25_);
-#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		refresh_token = _tmp26_;
-#line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp27_ = refresh_token;
-#line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (g_strcmp0 (_tmp27_, "") != 0) {
-#line 1736 "GoogleAuthenticator.c"
+#line 1796 "GoogleAuthenticator.c"
 			const gchar* _tmp28_;
-#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp28_ = refresh_token;
-#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			publishing_authenticator_shotwell_google_google_on_refresh_token_available (self, _tmp28_);
-#line 1742 "GoogleAuthenticator.c"
+#line 1802 "GoogleAuthenticator.c"
 		}
-#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (refresh_token);
-#line 1746 "GoogleAuthenticator.c"
+#line 1806 "GoogleAuthenticator.c"
 	}
-#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp29_ = response_obj;
-#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (json_object_has_member (_tmp29_, "access_token")) {
-#line 1752 "GoogleAuthenticator.c"
+#line 1812 "GoogleAuthenticator.c"
 		gchar* access_token = NULL;
 		JsonObject* _tmp30_;
 		const gchar* _tmp31_;
 		gchar* _tmp32_;
 		const gchar* _tmp33_;
-#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp30_ = response_obj;
-#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp31_ = json_object_get_string_member (_tmp30_, "access_token");
-#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp32_ = g_strdup (_tmp31_);
-#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		access_token = _tmp32_;
-#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp33_ = access_token;
-#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (g_strcmp0 (_tmp33_, "") != 0) {
-#line 1770 "GoogleAuthenticator.c"
+#line 1830 "GoogleAuthenticator.c"
 			const gchar* _tmp34_;
-#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp34_ = access_token;
-#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			publishing_authenticator_shotwell_google_google_on_access_token_available (self, _tmp34_);
-#line 1776 "GoogleAuthenticator.c"
+#line 1836 "GoogleAuthenticator.c"
 		}
-#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (access_token);
-#line 1780 "GoogleAuthenticator.c"
+#line 1840 "GoogleAuthenticator.c"
 	}
-#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 224 "/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"
+#line 224 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_object_unref0 (parser);
-#line 1786 "GoogleAuthenticator.c"
+#line 1846 "GoogleAuthenticator.c"
 }
 
 
@@ -1806,32 +1867,32 @@ publishing_authenticator_shotwell_google_google_on_refresh_token_available (Publ
 	GVariant* _tmp2_;
 	PublishingAuthenticatorShotwellGoogleSession* _tmp3_;
 	gchar* _tmp4_;
-#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 266 "/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"
+#line 266 "/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"
-	g_debug ("GoogleAuthenticator.vala:248: EVENT: an OAuth refresh token has become" \
+#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:267: EVENT: an OAuth refresh token has become" \
 " available; token = '%s'.", token);
-#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = self->priv->params;
-#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp1_ = g_strdup ("RefreshToken");
-#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = g_variant_new_string (token);
-#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_variant_ref_sink (_tmp2_);
-#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_hash_table_insert (_tmp0_, _tmp1_, _tmp2_);
-#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp3_ = self->priv->session;
-#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp4_ = g_strdup (token);
-#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp3_->refresh_token);
-#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp3_->refresh_token = _tmp4_;
-#line 1823 "GoogleAuthenticator.c"
+#line 1883 "GoogleAuthenticator.c"
 }
 
 
@@ -1843,25 +1904,25 @@ publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (Publish
 	GHashTable* _tmp1_;
 	gchar* _tmp2_;
 	GVariant* _tmp3_;
-#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 273 "/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"
+#line 274 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_debug ("EVENT: an OAuth access token expiry time became available; time = %'" G_GINT64_FORMAT "'.", abs_time);
-#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = self->priv->session;
-#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_->expires_at = abs_time;
-#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp1_ = self->priv->params;
-#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = g_strdup ("ExpiryTime");
-#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp3_ = g_variant_new_int64 (abs_time);
-#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_variant_ref_sink (_tmp3_);
-#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_hash_table_insert (_tmp1_, _tmp2_, _tmp3_);
-#line 1853 "GoogleAuthenticator.c"
+#line 1913 "GoogleAuthenticator.c"
 }
 
 
@@ -1874,34 +1935,34 @@ publishing_authenticator_shotwell_google_google_on_access_token_available (Publi
 	GHashTable* _tmp2_;
 	gchar* _tmp3_;
 	GVariant* _tmp4_;
-#line 263 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 282 "/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"
+#line 282 "/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"
-	g_debug ("GoogleAuthenticator.vala:264: EVENT: an OAuth access token has become " \
+#line 283 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:283: EVENT: an OAuth access token has become " \
 "available; token = '%s'.", token);
-#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = self->priv->session;
-#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp1_ = g_strdup (token);
-#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp0_->access_token);
-#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_->access_token = _tmp1_;
-#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = self->priv->params;
-#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp3_ = g_strdup ("AccessToken");
-#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp4_ = g_variant_new_string (token);
-#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_variant_ref_sink (_tmp4_);
-#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_hash_table_insert (_tmp2_, _tmp3_, _tmp4_);
-#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_do_fetch_username (self);
-#line 1892 "GoogleAuthenticator.c"
+#line 1952 "GoogleAuthenticator.c"
 }
 
 
@@ -1909,9 +1970,9 @@ 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"
+#line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
-#line 1902 "GoogleAuthenticator.c"
+#line 1962 "GoogleAuthenticator.c"
 }
 
 
@@ -1920,9 +1981,9 @@ _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_e
                                                                                                                                         GError* err,
                                                                                                                                         gpointer self)
 {
-#line 280 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 299 "/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"
+#line 1973 "GoogleAuthenticator.c"
 }
 
 
@@ -1935,36 +1996,36 @@ publishing_authenticator_shotwell_google_google_do_fetch_username (PublishingAut
 	PublishingAuthenticatorShotwellGoogleSession* _tmp2_;
 	PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* _tmp3_;
 	GError * _inner_error_ = NULL;
-#line 272 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 291 "/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" \
+#line 292 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:292: ACTION: running network transaction to f" \
 "etch username.");
-#line 275 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = self->priv->host;
-#line 275 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 294 "/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"
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp1_ = self->priv->host;
-#line 276 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 295 "/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"
+#line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = self->priv->session;
-#line 278 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 297 "/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"
+#line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	txn = _tmp3_;
-#line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 298 "/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"
+#line 299 "/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 1948 "GoogleAuthenticator.c"
+#line 2008 "GoogleAuthenticator.c"
 	{
-#line 283 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 302 "/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"
+#line 302 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1954 "GoogleAuthenticator.c"
+#line 2014 "GoogleAuthenticator.c"
 			goto __catch5_g_error;
 		}
 	}
@@ -1974,36 +2035,36 @@ publishing_authenticator_shotwell_google_google_do_fetch_username (PublishingAut
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_;
 		GError* _tmp5_;
-#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		err = _inner_error_;
-#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_inner_error_ = NULL;
-#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp4_ = self->priv->host;
-#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp5_ = err;
-#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 304 "/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"
+#line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (err);
-#line 1976 "GoogleAuthenticator.c"
+#line 2036 "GoogleAuthenticator.c"
 	}
 	__finally5:
-#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 301 "/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"
+#line 301 "/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"
+#line 301 "/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"
+#line 301 "/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"
+#line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 1989 "GoogleAuthenticator.c"
+#line 2049 "GoogleAuthenticator.c"
 	}
-#line 272 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 1993 "GoogleAuthenticator.c"
+#line 2053 "GoogleAuthenticator.c"
 }
 
 
@@ -2015,30 +2076,30 @@ publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_co
 	guint _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
-#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 308 "/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"
+#line 308 "/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"
+#line 309 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
-#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 309 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 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"
+#line 310 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (txn, 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_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" \
+#line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:312: EVENT: username fetch transaction comple" \
 "ted successfully.");
-#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = publishing_rest_support_transaction_get_response (txn);
-#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp3_ = _tmp2_;
-#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_do_extract_username (self, _tmp3_);
-#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp3_);
-#line 2027 "GoogleAuthenticator.c"
+#line 2087 "GoogleAuthenticator.c"
 }
 
 
@@ -2050,26 +2111,26 @@ publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_er
 	guint _tmp0_;
 	guint _tmp1_;
 	SpitPublishingPluginHost* _tmp2_;
-#line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 317 "/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"
+#line 317 "/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"
+#line 319 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
-#line 300 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 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"
+#line 320 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (txn, 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_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" \
+#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:322: EVENT: username fetch transaction caused" \
 " a network error");
-#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = self->priv->host;
-#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	spit_publishing_plugin_host_post_error (_tmp2_, err);
-#line 2057 "GoogleAuthenticator.c"
+#line 2117 "GoogleAuthenticator.c"
 }
 
 
@@ -2091,27 +2152,27 @@ publishing_authenticator_shotwell_google_google_do_extract_username (PublishingA
 	PublishingAuthenticatorShotwellGoogleSession* _tmp33_;
 	const gchar* _tmp34_;
 	GError * _inner_error_ = NULL;
-#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 327 "/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"
+#line 327 "/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" \
+#line 328 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:328: ACTION: extracting username from body of" \
 " server response");
-#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = json_parser_new ();
-#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	parser = _tmp0_;
-#line 2089 "GoogleAuthenticator.c"
+#line 2149 "GoogleAuthenticator.c"
 	{
 		JsonParser* _tmp1_;
-#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp1_ = parser;
-#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		json_parser_load_from_data (_tmp1_, response_body, (gssize) -1, &_inner_error_);
-#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2098 "GoogleAuthenticator.c"
+#line 2158 "GoogleAuthenticator.c"
 			goto __catch6_g_error;
 		}
 	}
@@ -2126,170 +2187,170 @@ publishing_authenticator_shotwell_google_google_do_extract_username (PublishingA
 		gchar* _tmp6_;
 		GError* _tmp7_;
 		GError* _tmp8_;
-#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		err = _inner_error_;
-#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_inner_error_ = NULL;
-#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp2_ = self->priv->host;
-#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp3_ = err;
-#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp4_ = _tmp3_->message;
-#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp5_ = g_strconcat ("Couldn't parse JSON response: ", _tmp4_, NULL);
-#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp6_ = _tmp5_;
-#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp6_);
-#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp8_ = _tmp7_;
-#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		spit_publishing_plugin_host_post_error (_tmp2_, _tmp8_);
-#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (_tmp8_);
-#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (_tmp6_);
-#line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (err);
-#line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_object_unref0 (parser);
-#line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 2143 "GoogleAuthenticator.c"
+#line 2203 "GoogleAuthenticator.c"
 	}
 	__finally6:
-#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 332 "/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"
+#line 332 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_object_unref0 (parser);
-#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 332 "/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"
+#line 332 "/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"
+#line 332 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 2156 "GoogleAuthenticator.c"
+#line 2216 "GoogleAuthenticator.c"
 	}
-#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp9_ = parser;
-#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp10_ = json_parser_get_root (_tmp9_);
-#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp11_ = json_node_get_object (_tmp10_);
-#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp12_ = _json_object_ref0 (_tmp11_);
-#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	response_obj = _tmp12_;
-#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 342 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp13_ = response_obj;
-#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 342 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (json_object_has_member (_tmp13_, "name")) {
-#line 2172 "GoogleAuthenticator.c"
+#line 2232 "GoogleAuthenticator.c"
 		gchar* username = NULL;
 		JsonObject* _tmp14_;
 		const gchar* _tmp15_;
 		gchar* _tmp16_;
 		const gchar* _tmp17_;
-#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp14_ = response_obj;
-#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp15_ = json_object_get_string_member (_tmp14_, "name");
-#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp16_ = g_strdup (_tmp15_);
-#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		username = _tmp16_;
-#line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp17_ = username;
-#line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (g_strcmp0 (_tmp17_, "") != 0) {
-#line 2190 "GoogleAuthenticator.c"
+#line 2250 "GoogleAuthenticator.c"
 			GHashTable* _tmp18_;
 			gchar* _tmp19_;
 			const gchar* _tmp20_;
 			GVariant* _tmp21_;
-#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp18_ = self->priv->params;
-#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp19_ = g_strdup ("UserName");
-#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp20_ = username;
-#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp21_ = g_variant_new_string (_tmp20_);
-#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			g_variant_ref_sink (_tmp21_);
-#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			g_hash_table_insert (_tmp18_, _tmp19_, _tmp21_);
-#line 2207 "GoogleAuthenticator.c"
+#line 2267 "GoogleAuthenticator.c"
 		}
-#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 342 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (username);
-#line 2211 "GoogleAuthenticator.c"
+#line 2271 "GoogleAuthenticator.c"
 	}
-#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp22_ = response_obj;
-#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (json_object_has_member (_tmp22_, "access_token")) {
-#line 2217 "GoogleAuthenticator.c"
+#line 2277 "GoogleAuthenticator.c"
 		gchar* access_token = NULL;
 		JsonObject* _tmp23_;
 		const gchar* _tmp24_;
 		gchar* _tmp25_;
 		const gchar* _tmp26_;
-#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp23_ = response_obj;
-#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp24_ = json_object_get_string_member (_tmp23_, "access_token");
-#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp25_ = g_strdup (_tmp24_);
-#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		access_token = _tmp25_;
-#line 333 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp26_ = access_token;
-#line 333 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		if (g_strcmp0 (_tmp26_, "") != 0) {
-#line 2235 "GoogleAuthenticator.c"
+#line 2295 "GoogleAuthenticator.c"
 			GHashTable* _tmp27_;
 			gchar* _tmp28_;
 			const gchar* _tmp29_;
 			GVariant* _tmp30_;
-#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp27_ = self->priv->params;
-#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp28_ = g_strdup ("AccessToken");
-#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp29_ = access_token;
-#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			_tmp30_ = g_variant_new_string (_tmp29_);
-#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			g_variant_ref_sink (_tmp30_);
-#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			g_hash_table_insert (_tmp27_, _tmp28_, _tmp30_);
-#line 2252 "GoogleAuthenticator.c"
+#line 2312 "GoogleAuthenticator.c"
 		}
-#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_free0 (access_token);
-#line 2256 "GoogleAuthenticator.c"
+#line 2316 "GoogleAuthenticator.c"
 	}
-#line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp31_ = self->priv->session;
-#line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_vala_assert (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)), "session.is_authenticated()");
-#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp32_ = self->priv->host;
-#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp33_ = self->priv->session;
-#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp34_ = _tmp33_->refresh_token;
-#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", _tmp34_);
-#line 342 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 361 "/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"
+#line 327 "/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"
+#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_object_unref0 (parser);
-#line 2276 "GoogleAuthenticator.c"
+#line 2336 "GoogleAuthenticator.c"
 }
 
 
@@ -2297,9 +2358,9 @@ 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"
+#line 372 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
-#line 2286 "GoogleAuthenticator.c"
+#line 2346 "GoogleAuthenticator.c"
 }
 
 
@@ -2308,9 +2369,9 @@ _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transac
                                                                                                                                               GError* err,
                                                                                                                                               gpointer self)
 {
-#line 354 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 373 "/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 2297 "GoogleAuthenticator.c"
+#line 2357 "GoogleAuthenticator.c"
 }
 
 
@@ -2322,45 +2383,45 @@ publishing_authenticator_shotwell_google_google_do_exchange_refresh_token_for_ac
 	PublishingAuthenticatorShotwellGoogleSession* _tmp1_;
 	PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* _tmp2_;
 	GError * _inner_error_ = NULL;
-#line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 365 "/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" \
+#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:366: ACTION: exchanging OAuth refresh token f" \
 "or OAuth access token.");
-#line 349 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = self->priv->host;
-#line 349 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 368 "/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"
+#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp1_ = self->priv->session;
-#line 351 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 370 "/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"
+#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	txn = _tmp2_;
-#line 353 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 372 "/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"
+#line 373 "/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 2327 "GoogleAuthenticator.c"
+#line 2387 "GoogleAuthenticator.c"
 	{
-#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 376 "/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"
+#line 376 "/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"
+#line 376 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2335 "GoogleAuthenticator.c"
+#line 2395 "GoogleAuthenticator.c"
 				goto __catch7_spit_publishing_publishing_error;
 			}
-#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 376 "/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"
+#line 376 "/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"
+#line 376 "/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"
+#line 376 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 			return;
-#line 2346 "GoogleAuthenticator.c"
+#line 2406 "GoogleAuthenticator.c"
 		}
 	}
 	goto __finally7;
@@ -2369,36 +2430,36 @@ publishing_authenticator_shotwell_google_google_do_exchange_refresh_token_for_ac
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp3_;
 		GError* _tmp4_;
-#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		err = _inner_error_;
-#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_inner_error_ = NULL;
-#line 359 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp3_ = self->priv->host;
-#line 359 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp4_ = err;
-#line 359 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 378 "/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"
+#line 375 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_g_error_free0 (err);
-#line 2367 "GoogleAuthenticator.c"
+#line 2427 "GoogleAuthenticator.c"
 	}
 	__finally7:
-#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 375 "/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"
+#line 375 "/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"
+#line 375 "/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"
+#line 375 "/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"
+#line 375 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 2380 "GoogleAuthenticator.c"
+#line 2440 "GoogleAuthenticator.c"
 	}
-#line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 2384 "GoogleAuthenticator.c"
+#line 2444 "GoogleAuthenticator.c"
 }
 
 
@@ -2411,38 +2472,38 @@ publishing_authenticator_shotwell_google_google_on_refresh_access_token_transact
 	PublishingAuthenticatorShotwellGoogleSession* _tmp2_;
 	gchar* _tmp3_;
 	gchar* _tmp4_;
-#line 363 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 382 "/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"
+#line 382 "/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"
+#line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
-#line 365 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 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"
+#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (txn, 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_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 " \
+#line 387 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:387: EVENT: refresh access token transaction " \
 "completed successfully.");
-#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = self->priv->session;
-#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
-#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 2417 "GoogleAuthenticator.c"
+#line 2477 "GoogleAuthenticator.c"
 	}
-#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp3_ = publishing_rest_support_transaction_get_response (txn);
-#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp4_ = _tmp3_;
-#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp4_);
-#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_g_free0 (_tmp4_);
-#line 2427 "GoogleAuthenticator.c"
+#line 2487 "GoogleAuthenticator.c"
 }
 
 
@@ -2450,13 +2511,13 @@ static gboolean
 ___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self)
 {
 	gboolean result = FALSE;
-#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 408 "/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"
+#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	result = FALSE;
-#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 2441 "GoogleAuthenticator.c"
+#line 2501 "GoogleAuthenticator.c"
 }
 
 
@@ -2465,9 +2526,9 @@ ____lambda4__gsource_func (gpointer self)
 {
 	gboolean result;
 	result = ___lambda4_ ((PublishingAuthenticatorShotwellGoogleGoogle*) self);
-#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	return result;
-#line 2452 "GoogleAuthenticator.c"
+#line 2512 "GoogleAuthenticator.c"
 }
 
 
@@ -2481,65 +2542,65 @@ publishing_authenticator_shotwell_google_google_on_refresh_access_token_transact
 	PublishingAuthenticatorShotwellGoogleSession* _tmp2_;
 	gboolean _tmp3_ = FALSE;
 	SpitPublishingPluginHost* _tmp5_;
-#line 376 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 395 "/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"
+#line 395 "/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"
+#line 397 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp0_, NULL, FALSE);
-#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (txn, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 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"
+#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 379 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	g_signal_handlers_disconnect_matched (txn, 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_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 " \
+#line 400 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:400: EVENT: refresh access token transaction " \
 "caused a network error.");
-#line 383 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp2_ = self->priv->session;
-#line 383 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession))) {
-#line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		return;
-#line 2486 "GoogleAuthenticator.c"
+#line 2546 "GoogleAuthenticator.c"
 	}
-#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (publishing_rest_support_transaction_get_status_code (txn) == ((guint) SOUP_STATUS_BAD_REQUEST)) {
-#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp3_ = TRUE;
-#line 2492 "GoogleAuthenticator.c"
+#line 2552 "GoogleAuthenticator.c"
 	} else {
-#line 386 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp3_ = publishing_rest_support_transaction_get_status_code (txn) == ((guint) SOUP_STATUS_UNAUTHORIZED);
-#line 2496 "GoogleAuthenticator.c"
+#line 2556 "GoogleAuthenticator.c"
 	}
-#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	if (_tmp3_) {
-#line 2500 "GoogleAuthenticator.c"
+#line 2560 "GoogleAuthenticator.c"
 		SpitPublishingPluginHost* _tmp4_;
-#line 388 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		_tmp4_ = self->priv->host;
-#line 388 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 		spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", "");
-#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 408 "/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 2508 "GoogleAuthenticator.c"
+#line 2568 "GoogleAuthenticator.c"
 	}
-#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp5_ = self->priv->host;
-#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	spit_publishing_plugin_host_post_error (_tmp5_, err);
-#line 2514 "GoogleAuthenticator.c"
+#line 2574 "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"
+#line 417 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_on_service_welcome_login ((PublishingAuthenticatorShotwellGoogleGoogle*) self);
-#line 2523 "GoogleAuthenticator.c"
+#line 2583 "GoogleAuthenticator.c"
 }
 
 
@@ -2548,84 +2609,84 @@ publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (Pu
 {
 	SpitPublishingPluginHost* _tmp0_;
 	const gchar* _tmp1_;
-#line 395 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 414 "/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"
+#line 415 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:415: ACTION: showing service welcome pane.");
+#line 417 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	_tmp0_ = self->priv->host;
-#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 417 "/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"
+#line 417 "/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 2542 "GoogleAuthenticator.c"
+#line 2602 "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"
+#line 420 "/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" \
+#line 421 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:421: EVENT: user clicked 'Login' in welcome p" \
 "ane.");
-#line 404 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 423 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (self);
-#line 2555 "GoogleAuthenticator.c"
+#line 2615 "GoogleAuthenticator.c"
 }
 
 
 static void
 publishing_authenticator_shotwell_google_google_class_init (PublishingAuthenticatorShotwellGoogleGoogleClass * klass)
 {
-#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 107 "/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"
+#line 107 "/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"
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_google_google_finalize;
-#line 2568 "GoogleAuthenticator.c"
+#line 2628 "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"
+#line 107 "/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"
+#line 107 "/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"
+#line 107 "/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"
+#line 107 "/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"
+#line 107 "/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"
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	iface->refresh = (void (*) (SpitPublishingAuthenticator *)) publishing_authenticator_shotwell_google_google_real_refresh;
-#line 2587 "GoogleAuthenticator.c"
+#line 2647 "GoogleAuthenticator.c"
 }
 
 
 static void
 publishing_authenticator_shotwell_google_google_instance_init (PublishingAuthenticatorShotwellGoogleGoogle * self)
 {
-#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 107 "/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"
+#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->priv->scope = NULL;
-#line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->priv->host = NULL;
-#line 91 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->priv->params = NULL;
-#line 92 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 111 "/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"
+#line 112 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->priv->session = NULL;
-#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	self->priv->welcome_message = NULL;
-#line 2608 "GoogleAuthenticator.c"
+#line 2668 "GoogleAuthenticator.c"
 }
 
 
@@ -2633,23 +2694,23 @@ static void
 publishing_authenticator_shotwell_google_google_finalize (GObject * obj)
 {
 	PublishingAuthenticatorShotwellGoogleGoogle * self;
-#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+#line 107 "/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"
+#line 108 "/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"
+#line 109 "/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"
+#line 110 "/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"
+#line 111 "/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"
+#line 112 "/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"
+#line 113 "/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"
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
 	G_OBJECT_CLASS (publishing_authenticator_shotwell_google_google_parent_class)->finalize (obj);
-#line 2632 "GoogleAuthenticator.c"
+#line 2692 "GoogleAuthenticator.c"
 }
 
 
diff --git a/plugins/authenticator/shotwell/GoogleAuthenticator.vala b/plugins/authenticator/shotwell/GoogleAuthenticator.vala
index 9271b57..f561197 100644
--- a/plugins/authenticator/shotwell/GoogleAuthenticator.vala
+++ b/plugins/authenticator/shotwell/GoogleAuthenticator.vala
@@ -3,34 +3,53 @@ using Shotwell.Plugins;
 
 namespace Publishing.Authenticator.Shotwell.Google {
     private const string OAUTH_CLIENT_ID = "534227538559-hvj2e8bj0vfv2f49r7gvjoq6jibfav67.apps.googleusercontent.com";
+    private const string REVERSE_CLIENT_ID = "com.googleusercontent.apps.534227538559-hvj2e8bj0vfv2f49r7gvjoq6jibfav67";
     private const string OAUTH_CLIENT_SECRET = "pwpzZ7W1TCcD5uIfYCu8sM7x";
+    private const string OAUTH_CALLBACK_URI = REVERSE_CLIENT_ID + ":/auth-callback";
 
     private class WebAuthenticationPane : Common.WebAuthenticationPane {
         public static bool cache_dirty = false;
+        private string? auth_code = null;
 
-        public signal void authorized(string auth_code);
+        public signal void error();
 
-        public WebAuthenticationPane(string auth_sequence_start_url) {
-            Object (login_uri : auth_sequence_start_url);
-        }
+        public override void constructed() {
+            base.constructed();
 
-        public static bool is_cache_dirty() {
-            return cache_dirty;
+            var ctx = WebKit.WebContext.get_default();
+            ctx.register_uri_scheme(REVERSE_CLIENT_ID, this.on_shotwell_auth_request_cb);
         }
 
         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;
+            var uri = new Soup.URI(get_view().get_uri());
+            if (uri.scheme == REVERSE_CLIENT_ID && this.auth_code == null) {
+                this.error();
+            }
 
-                string auth_code = page_title.substring(auth_code_field_start + 5); // 5 = "code=".length
+            if (this.auth_code != null) {
+                this.authorized(this.auth_code);
+            }
+        }
 
-                cache_dirty = true;
+        private void on_shotwell_auth_request_cb(WebKit.URISchemeRequest request) {
+            var uri = new Soup.URI(request.get_uri());
+            debug("URI: %s", request.get_uri());
+            var form_data = Soup.Form.decode (uri.query);
+            this.auth_code = form_data.lookup("code");
 
-                authorized(auth_code);
-            }
+            var response = "";
+            var mins = new MemoryInputStream.from_data(response.data, null);
+            request.finish(mins, -1, "text/plain");
+        }
+
+        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;
         }
     }
 
@@ -59,7 +78,7 @@ namespace Publishing.Authenticator.Shotwell.Google {
             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("redirect_uri", OAUTH_CALLBACK_URI);
             add_argument("grant_type", "authorization_code");
         }
     }
@@ -144,7 +163,7 @@ namespace Publishing.Authenticator.Shotwell.Google {
             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) + "&" +
+                "redirect_uri=" + Soup.URI.encode(OAUTH_CALLBACK_URI, null) + "&" +
                 "scope=" + Soup.URI.encode(this.scope, null) + "+" +
                 Soup.URI.encode("https://www.googleapis.com/auth/userinfo.profile", null) + "&" +
                 "state=connect&" +
diff --git a/po/shotwell.pot b/po/shotwell.pot
index da0fa07..744afae 100644
--- a/po/shotwell.pot
+++ b/po/shotwell.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: shotwell 0.28.3\n"
+"Project-Id-Version: shotwell 0.28.4\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=Shotwell&component=Internationalization\n"
-"POT-Creation-Date: 2018-05-07 19:39+0200\n"
+"POT-Creation-Date: 2018-07-14 13:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1273,7 +1273,7 @@ msgstr ""
 msgid "Verifying authorization…"
 msgstr ""
 
-#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:137
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -2251,7 +2251,7 @@ msgid "Camera"
 msgstr ""
 
 #. Translators: First %s is the name of camera as gotten from GPhoto, second is the GVolume name, e.g. Mass storage camera (510MB volume)
-#: src/camera/CameraTable.vala:351
+#: src/camera/CameraTable.vala:246
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -2716,7 +2716,7 @@ msgstr ""
 msgid "Database file:"
 msgstr ""
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:782
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:783
 msgid "_Import"
 msgstr ""
 
@@ -4003,23 +4003,23 @@ msgstr ""
 msgid "Photos"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:508
+#: src/library/LibraryWindow.vala:509
 msgid "Import From Folder"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:515
+#: src/library/LibraryWindow.vala:516
 msgid "Recurse Into Subfolders"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:583 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:584 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:583
+#: src/library/LibraryWindow.vala:584
 msgid "Emptying Trash…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:779
+#: src/library/LibraryWindow.vala:780
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4028,33 +4028,33 @@ msgid ""
 "Do you want to continue importing photos?"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:782 ui/preferences_dialog.ui:142
+#: src/library/LibraryWindow.vala:783 ui/preferences_dialog.ui:142
 msgid "Library Location"
 msgstr ""
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:795
+#: src/library/LibraryWindow.vala:796
 msgid "Photos cannot be imported from this directory."
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1075
+#: src/library/LibraryWindow.vala:1076
 #, c-format
 msgid "%s (%d%%)"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1119 src/library/LibraryWindow.vala:1130
+#: src/library/LibraryWindow.vala:1120 src/library/LibraryWindow.vala:1131
 msgid "Updating library…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1136
+#: src/library/LibraryWindow.vala:1137
 msgid "Preparing to auto-import photos…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1141
+#: src/library/LibraryWindow.vala:1142
 msgid "Auto-importing photos…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1149
+#: src/library/LibraryWindow.vala:1150
 msgid "Writing metadata to files…"
 msgstr ""
 
diff --git a/po/tr.gmo b/po/tr.gmo
index 92cdb67..776f469 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index f527032..4bbe2b7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -94,7 +94,7 @@ msgstr ""
 "albüm;kamera;kameralar;kırp;düzenle;güzelleştir;dışa aktar;galeri;görüntü;"
 "görüntüler;içe aktar;yerleştir;foto;fotoğraflar;fotolar;resim;resimler;"
 "fotoğrafçılık;yazdır;baskı;yayımlamak;döndür;paylaş;etiketler;video;facebook;"
-"flickr;picasa;youtube;piwigo"
+"flickr;picasa;youtube;piwigo;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: misc/shotwell.desktop.in:11 misc/shotwell-viewer.desktop.in:8
diff --git a/src/CollectionPage.c b/src/CollectionPage.c
index 6086969..9c194d3 100644
--- a/src/CollectionPage.c
+++ b/src/CollectionPage.c
@@ -1256,6 +1256,10 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
                                                                      int* result_length1);
 InjectionGroup** page_init_collect_injection_groups (Page* self,
                                                      int* result_length1);
+static void _vala_array_add79 (InjectionGroup** * array,
+                        int* length,
+                        int* size,
+                        InjectionGroup* value);
 static void _vala_array_add80 (InjectionGroup** * array,
                         int* length,
                         int* size,
@@ -1276,10 +1280,6 @@ static void _vala_array_add84 (InjectionGroup** * array,
                         int* length,
                         int* size,
                         InjectionGroup* value);
-static void _vala_array_add85 (InjectionGroup** * array,
-                        int* length,
-                        int* size,
-                        InjectionGroup* value);
 static gboolean collection_page_selection_has_video (CollectionPage* self);
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
@@ -2369,7 +2369,7 @@ collection_page_real_remove_actions (Page* base,
 
 
 static void
-_vala_array_add80 (InjectionGroup** * array,
+_vala_array_add79 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -2391,7 +2391,7 @@ _vala_array_add80 (InjectionGroup** * array,
 
 
 static void
-_vala_array_add81 (InjectionGroup** * array,
+_vala_array_add80 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -2413,7 +2413,7 @@ _vala_array_add81 (InjectionGroup** * array,
 
 
 static void
-_vala_array_add82 (InjectionGroup** * array,
+_vala_array_add81 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -2435,7 +2435,7 @@ _vala_array_add82 (InjectionGroup** * array,
 
 
 static void
-_vala_array_add83 (InjectionGroup** * array,
+_vala_array_add82 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -2457,7 +2457,7 @@ _vala_array_add83 (InjectionGroup** * array,
 
 
 static void
-_vala_array_add84 (InjectionGroup** * array,
+_vala_array_add83 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -2479,7 +2479,7 @@ _vala_array_add84 (InjectionGroup** * array,
 
 
 static void
-_vala_array_add85 (InjectionGroup** * array,
+_vala_array_add84 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -2548,7 +2548,7 @@ collection_page_real_init_collect_injection_groups (Page* base,
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = collection_page_create_file_menu_injectables ();
 #line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add80 (&groups, &groups_length1, &_groups_size_, _tmp3_);
+	_vala_array_add79 (&groups, &groups_length1, &_groups_size_, _tmp3_);
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = groups;
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2556,7 +2556,7 @@ collection_page_real_init_collect_injection_groups (Page* base,
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = collection_page_create_edit_menu_injectables ();
 #line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add81 (&groups, &groups_length1, &_groups_size_, _tmp5_);
+	_vala_array_add80 (&groups, &groups_length1, &_groups_size_, _tmp5_);
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = groups;
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2564,7 +2564,7 @@ collection_page_real_init_collect_injection_groups (Page* base,
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = collection_page_create_view_menu_fullscreen_injectables ();
 #line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp7_);
+	_vala_array_add81 (&groups, &groups_length1, &_groups_size_, _tmp7_);
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = groups;
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2572,7 +2572,7 @@ collection_page_real_init_collect_injection_groups (Page* base,
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = collection_page_create_photos_menu_edits_injectables ();
 #line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp9_);
+	_vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp9_);
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = groups;
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2580,7 +2580,7 @@ collection_page_real_init_collect_injection_groups (Page* base,
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = collection_page_create_photos_menu_date_injectables ();
 #line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp11_);
+	_vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp11_);
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = groups;
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -2588,7 +2588,7 @@ collection_page_real_init_collect_injection_groups (Page* base,
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = collection_page_create_photos_menu_externals_injectables ();
 #line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add85 (&groups, &groups_length1, &_groups_size_, _tmp13_);
+	_vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp13_);
 #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = groups;
 #line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
diff --git a/src/Exporter.c b/src/Exporter.c
index e8f0cf2..bdc1f1f 100644
--- a/src/Exporter.c
+++ b/src/Exporter.c
@@ -491,7 +491,7 @@ static void exporter_on_exported (Exporter* self,
                            BackgroundJob* j);
 static GType exporter_export_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType background_job_job_priority_get_type (void) G_GNUC_CONST;
-static void _vala_array_add129 (GFile** * array,
+static void _vala_array_add128 (GFile** * array,
                          int* length,
                          int* size,
                          GFile* value);
@@ -510,7 +510,7 @@ gchar* photo_get_export_basename_for_parameters (Photo* self,
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
 gchar* media_source_get_basename (MediaSource* self);
-static void _vala_array_add130 (GFile** * array,
+static void _vala_array_add129 (GFile** * array,
                          int* length,
                          int* size,
                          GFile* value);
@@ -1024,7 +1024,7 @@ _background_job_ref0 (gpointer self)
 
 
 static void
-_vala_array_add129 (GFile** * array,
+_vala_array_add128 (GFile** * array,
                     int* length,
                     int* size,
                     GFile* value)
@@ -1227,7 +1227,7 @@ exporter_on_exported (Exporter* self,
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
 			_tmp32_ = _g_object_ref0 (_tmp31_);
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_vala_array_add129 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp32_);
+			_vala_array_add128 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp32_);
 #line 1232 "Exporter.c"
 		}
 	}
@@ -1343,7 +1343,7 @@ exporter_get_exported_files (Exporter* self,
 
 
 static void
-_vala_array_add130 (GFile** * array,
+_vala_array_add129 (GFile** * array,
                     int* length,
                     int* size,
                     GFile* value)
@@ -1522,7 +1522,7 @@ exporter_process_queue (Exporter* self)
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
 				_tmp20_ = _g_object_ref0 (_tmp19_);
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
-				_vala_array_add130 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp20_);
+				_vala_array_add129 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp20_);
 #line 212 "/home/jens/Source/shotwell/src/Exporter.vala"
 				_tmp21_ = self->priv->completed_count;
 #line 212 "/home/jens/Source/shotwell/src/Exporter.vala"
diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c
index 572b37b..dc4d603 100644
--- a/src/LibraryMonitor.c
+++ b/src/LibraryMonitor.c
@@ -1218,7 +1218,7 @@ GFile* media_monitor_get_master_file (MediaMonitor* self,
 GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self,
                                                     Monitorable* monitorable,
                                                     int* result_length1);
-static void _vala_array_add131 (GFile** * array,
+static void _vala_array_add130 (GFile** * array,
                          int* length,
                          int* size,
                          GFile* value);
@@ -4108,7 +4108,7 @@ library_monitor_verify_monitorable_finish (LibraryMonitor* self,
 
 
 static void
-_vala_array_add131 (GFile** * array,
+_vala_array_add130 (GFile** * array,
                     int* length,
                     int* size,
                     GFile* value)
@@ -4248,7 +4248,7 @@ library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonitorableData* _dat
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp11_ = _g_object_ref0 (_data_->_tmp10_);
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_vala_array_add131 (&_data_->files, &_data_->files_length1, &_data_->_files_size_, _data_->_tmp11_);
+					_vala_array_add130 (&_data_->files, &_data_->files_length1, &_data_->_files_size_, _data_->_tmp11_);
 #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (_data_->aux_file);
 #line 4255 "LibraryMonitor.c"
diff --git a/src/Photo.c b/src/Photo.c
index 3509b5d..3da6c81 100644
--- a/src/Photo.c
+++ b/src/Photo.c
@@ -2273,18 +2273,18 @@ BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_
 BackingFileState* backing_file_state_construct_from_photo_row (GType object_type,
                                                                BackingPhotoRow* photo_row,
                                                                const gchar* md5);
-static void _vala_array_add89 (BackingFileState** * array,
+static void _vala_array_add88 (BackingFileState** * array,
                         int* length,
                         int* size,
                         BackingFileState* value);
 gboolean photo_has_editable (Photo* self);
-static void _vala_array_add90 (BackingFileState** * array,
+static void _vala_array_add89 (BackingFileState** * array,
                         int* length,
                         int* size,
                         BackingFileState* value);
 gboolean photo_is_developed (Photo* self);
 GeeCollection* photo_get_raw_development_photo_rows (Photo* self);
-static void _vala_array_add91 (BackingFileState** * array,
+static void _vala_array_add90 (BackingFileState** * array,
                         int* length,
                         int* size,
                         BackingFileState* value);
@@ -2391,6 +2391,10 @@ GType photo_reimport_master_state_get_type (void) G_GNUC_CONST;
 gboolean photo_prepare_for_reimport_master (Photo* self,
                                             PhotoReimportMasterState* * reimport_state,
                                             GError** error);
+static void _vala_array_add91 (gchar** * array,
+                        int* length,
+                        int* size,
+                        gchar* value);
 static void _vala_array_add92 (gchar** * array,
                         int* length,
                         int* size,
@@ -2411,10 +2415,6 @@ static void _vala_array_add96 (gchar** * array,
                         int* length,
                         int* size,
                         gchar* value);
-static void _vala_array_add97 (gchar** * array,
-                        int* length,
-                        int* size,
-                        gchar* value);
 static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row,
                                                                     PhotoMetadata* metadata,
                                                                     gchar** alterations,
@@ -2437,11 +2437,11 @@ void photo_table_reimport (PhotoTable* self,
                            GError** error);
 void backing_photo_row_copy_from (BackingPhotoRow* self,
                                   BackingPhotoRow* from);
-static void _vala_array_add98 (gchar** * array,
+static void _vala_array_add97 (gchar** * array,
                         int* length,
                         int* size,
                         gchar* value);
-static void _vala_array_add99 (gchar** * array,
+static void _vala_array_add98 (gchar** * array,
                         int* length,
                         int* size,
                         gchar* value);
@@ -2611,6 +2611,10 @@ void photo_table_set_filepath (PhotoTable* self,
 void media_source_notify_master_replaced (MediaSource* self,
                                           GFile* old_file,
                                           GFile* new_file);
+static void _vala_array_add99 (gchar** * array,
+                        int* length,
+                        int* size,
+                        gchar* value);
 static void _vala_array_add100 (gchar** * array,
                          int* length,
                          int* size,
@@ -2623,25 +2627,21 @@ static void _vala_array_add102 (gchar** * array,
                          int* length,
                          int* size,
                          gchar* value);
-static void _vala_array_add103 (gchar** * array,
-                         int* length,
-                         int* size,
-                         gchar* value);
 void photo_set_editable_file (Photo* self,
                               GFile* file);
 void backing_photo_table_set_filepath (BackingPhotoTable* self,
                                        BackingPhotoID* id,
                                        const gchar* filepath,
                                        GError** error);
-static void _vala_array_add104 (gchar** * array,
+static void _vala_array_add103 (gchar** * array,
                          int* length,
                          int* size,
                          gchar* value);
-static void _vala_array_add105 (gchar** * array,
+static void _vala_array_add104 (gchar** * array,
                          int* length,
                          int* size,
                          gchar* value);
-static void _vala_array_add106 (gchar** * array,
+static void _vala_array_add105 (gchar** * array,
                          int* length,
                          int* size,
                          gchar* value);
@@ -3128,6 +3128,10 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self,
                                             time_t timestamp,
                                             gint64 filesize,
                                             GError** error);
+static void _vala_array_add106 (gchar** * array,
+                         int* length,
+                         int* size,
+                         gchar* value);
 static void _vala_array_add107 (gchar** * array,
                          int* length,
                          int* size,
@@ -3148,10 +3152,6 @@ static void _vala_array_add111 (gchar** * array,
                          int* length,
                          int* size,
                          gchar* value);
-static void _vala_array_add112 (gchar** * array,
-                         int* length,
-                         int* size,
-                         gchar* value);
 void backing_photo_id_init (BackingPhotoID *self,
                             gint64 id);
 const gchar* g_file_monitor_event_to_string (GFileMonitorEvent self);
@@ -8432,7 +8432,7 @@ photo_redevelop_raw (Photo* self,
 
 
 static void
-_vala_array_add89 (BackingFileState** * array,
+_vala_array_add88 (BackingFileState** * array,
                    int* length,
                    int* size,
                    BackingFileState* value)
@@ -8454,7 +8454,7 @@ _vala_array_add89 (BackingFileState** * array,
 
 
 static void
-_vala_array_add90 (BackingFileState** * array,
+_vala_array_add89 (BackingFileState** * array,
                    int* length,
                    int* size,
                    BackingFileState* value)
@@ -8476,7 +8476,7 @@ _vala_array_add90 (BackingFileState** * array,
 
 
 static void
-_vala_array_add91 (BackingFileState** * array,
+_vala_array_add90 (BackingFileState** * array,
                    int* length,
                    int* size,
                    BackingFileState* value)
@@ -8551,7 +8551,7 @@ photo_real_get_backing_files_state (MediaSource* base,
 #line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = backing_file_state_new_from_photo_row (_tmp4_, _tmp6_);
 #line 940 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add89 (&backing, &backing_length1, &_backing_size_, _tmp7_);
+			_vala_array_add88 (&backing, &backing_length1, &_backing_size_, _tmp7_);
 #line 941 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (photo_has_editable (self)) {
 #line 8558 "Photo.c"
@@ -8568,7 +8568,7 @@ photo_real_get_backing_files_state (MediaSource* base,
 #line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = backing_file_state_new_from_photo_row (_tmp9_, NULL);
 #line 942 "/home/jens/Source/shotwell/src/Photo.vala"
-				_vala_array_add90 (&backing, &backing_length1, &_backing_size_, _tmp10_);
+				_vala_array_add89 (&backing, &backing_length1, &_backing_size_, _tmp10_);
 #line 8573 "Photo.c"
 			}
 #line 944 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8638,7 +8638,7 @@ photo_real_get_backing_files_state (MediaSource* base,
 #line 949 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp22_ = backing_file_state_new_from_photo_row (_tmp21_, NULL);
 #line 949 "/home/jens/Source/shotwell/src/Photo.vala"
-							_vala_array_add91 (&backing, &backing_length1, &_backing_size_, _tmp22_);
+							_vala_array_add90 (&backing, &backing_length1, &_backing_size_, _tmp22_);
 #line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (r);
 #line 8645 "Photo.c"
@@ -11682,7 +11682,7 @@ photo_query_backing_photo_row (Photo* self,
 
 
 static void
-_vala_array_add92 (gchar** * array,
+_vala_array_add91 (gchar** * array,
                    int* length,
                    int* size,
                    gchar* value)
@@ -11704,7 +11704,7 @@ _vala_array_add92 (gchar** * array,
 
 
 static void
-_vala_array_add93 (gchar** * array,
+_vala_array_add92 (gchar** * array,
                    int* length,
                    int* size,
                    gchar* value)
@@ -11726,7 +11726,7 @@ _vala_array_add93 (gchar** * array,
 
 
 static void
-_vala_array_add94 (gchar** * array,
+_vala_array_add93 (gchar** * array,
                    int* length,
                    int* size,
                    gchar* value)
@@ -11748,7 +11748,7 @@ _vala_array_add94 (gchar** * array,
 
 
 static void
-_vala_array_add95 (gchar** * array,
+_vala_array_add94 (gchar** * array,
                    int* length,
                    int* size,
                    gchar* value)
@@ -11770,7 +11770,7 @@ _vala_array_add95 (gchar** * array,
 
 
 static void
-_vala_array_add96 (gchar** * array,
+_vala_array_add95 (gchar** * array,
                    int* length,
                    int* size,
                    gchar* value)
@@ -11792,7 +11792,7 @@ _vala_array_add96 (gchar** * array,
 
 
 static void
-_vala_array_add97 (gchar** * array,
+_vala_array_add96 (gchar** * array,
                    int* length,
                    int* size,
                    gchar* value)
@@ -12123,7 +12123,7 @@ photo_prepare_for_reimport_master (Photo* self,
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = g_strdup ("metadata:md5");
 #line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add92 (&list, &list_length1, &_list_size_, _tmp35_);
+		_vala_array_add91 (&list, &list_length1, &_list_size_, _tmp35_);
 #line 12126 "Photo.c"
 	}
 #line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12153,7 +12153,7 @@ photo_prepare_for_reimport_master (Photo* self,
 #line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = g_strdup ("image:orientation");
 #line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add93 (&list, &list_length1, &_list_size_, _tmp42_);
+		_vala_array_add92 (&list, &list_length1, &_list_size_, _tmp42_);
 #line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = updated_row;
 #line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12240,7 +12240,7 @@ photo_prepare_for_reimport_master (Photo* self,
 #line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = g_strdup ("metadata:exposure-time");
 #line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add94 (&list, &list_length1, &_list_size_, _tmp58_);
+			_vala_array_add93 (&list, &list_length1, &_list_size_, _tmp58_);
 #line 12243 "Photo.c"
 		}
 #line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12272,7 +12272,7 @@ photo_prepare_for_reimport_master (Photo* self,
 #line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp67_ = g_strdup ("metadata:name");
 #line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add95 (&list, &list_length1, &_list_size_, _tmp67_);
+			_vala_array_add94 (&list, &list_length1, &_list_size_, _tmp67_);
 #line 12275 "Photo.c"
 		}
 #line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12304,7 +12304,7 @@ photo_prepare_for_reimport_master (Photo* self,
 #line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = g_strdup ("metadata:comment");
 #line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add96 (&list, &list_length1, &_list_size_, _tmp76_);
+			_vala_array_add95 (&list, &list_length1, &_list_size_, _tmp76_);
 #line 12307 "Photo.c"
 		}
 #line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12328,7 +12328,7 @@ photo_prepare_for_reimport_master (Photo* self,
 #line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp82_ = g_strdup ("metadata:rating");
 #line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add97 (&list, &list_length1, &_list_size_, _tmp82_);
+			_vala_array_add96 (&list, &list_length1, &_list_size_, _tmp82_);
 #line 12331 "Photo.c"
 		}
 #line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12556,7 +12556,7 @@ _photo_reimport_master_state_ref0 (gpointer self)
 
 
 static void
-_vala_array_add98 (gchar** * array,
+_vala_array_add97 (gchar** * array,
                    int* length,
                    int* size,
                    gchar* value)
@@ -12578,7 +12578,7 @@ _vala_array_add98 (gchar** * array,
 
 
 static void
-_vala_array_add99 (gchar** * array,
+_vala_array_add98 (gchar** * array,
                    int* length,
                    int* size,
                    gchar* value)
@@ -12786,7 +12786,7 @@ photo_finish_reimport_master (Photo* self,
 #line 1529 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = g_strdup ("image:master");
 #line 1529 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add98 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp23_);
+		_vala_array_add97 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp23_);
 #line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (photo_is_master_baseline (self)) {
 #line 12791 "Photo.c"
@@ -12800,7 +12800,7 @@ photo_finish_reimport_master (Photo* self,
 #line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = g_strdup ("image:baseline");
 #line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add99 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp25_);
+			_vala_array_add98 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp25_);
 #line 12803 "Photo.c"
 		}
 	}
@@ -14879,10 +14879,10 @@ photo_real_get_file (MediaSource* base)
 
 
 static void
-_vala_array_add100 (gchar** * array,
-                    int* length,
-                    int* size,
-                    gchar* value)
+_vala_array_add99 (gchar** * array,
+                   int* length,
+                   int* size,
+                   gchar* value)
 {
 #line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
@@ -14901,7 +14901,7 @@ _vala_array_add100 (gchar** * array,
 
 
 static void
-_vala_array_add101 (gchar** * array,
+_vala_array_add100 (gchar** * array,
                     int* length,
                     int* size,
                     gchar* value)
@@ -14923,7 +14923,7 @@ _vala_array_add101 (gchar** * array,
 
 
 static void
-_vala_array_add102 (gchar** * array,
+_vala_array_add101 (gchar** * array,
                     int* length,
                     int* size,
                     gchar* value)
@@ -14945,7 +14945,7 @@ _vala_array_add102 (gchar** * array,
 
 
 static void
-_vala_array_add103 (gchar** * array,
+_vala_array_add102 (gchar** * array,
                     int* length,
                     int* size,
                     gchar* value)
@@ -15274,7 +15274,7 @@ photo_set_master_file (Photo* self,
 #line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = g_strdup ("backing:master");
 #line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp38_);
+		_vala_array_add99 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp38_);
 #line 1874 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = name_changed;
 #line 1874 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15290,7 +15290,7 @@ photo_set_master_file (Photo* self,
 #line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = g_strdup ("metadata:name");
 #line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp41_);
+			_vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp41_);
 #line 15293 "Photo.c"
 		}
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15308,7 +15308,7 @@ photo_set_master_file (Photo* self,
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = g_strdup ("backing:source");
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp44_);
+			_vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp44_);
 #line 15311 "Photo.c"
 		}
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15326,7 +15326,7 @@ photo_set_master_file (Photo* self,
 #line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp47_ = g_strdup ("backing:baseline");
 #line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_);
+			_vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_);
 #line 15329 "Photo.c"
 		}
 #line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15354,7 +15354,7 @@ photo_set_master_file (Photo* self,
 
 
 static void
-_vala_array_add104 (gchar** * array,
+_vala_array_add103 (gchar** * array,
                     int* length,
                     int* size,
                     gchar* value)
@@ -15376,7 +15376,7 @@ _vala_array_add104 (gchar** * array,
 
 
 static void
-_vala_array_add105 (gchar** * array,
+_vala_array_add104 (gchar** * array,
                     int* length,
                     int* size,
                     gchar* value)
@@ -15398,7 +15398,7 @@ _vala_array_add105 (gchar** * array,
 
 
 static void
-_vala_array_add106 (gchar** * array,
+_vala_array_add105 (gchar** * array,
                     int* length,
                     int* size,
                     gchar* value)
@@ -15719,7 +15719,7 @@ photo_set_editable_file (Photo* self,
 #line 1923 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = g_strdup ("backing:editable");
 #line 1923 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp34_);
+		_vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp34_);
 #line 1925 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = is_baseline;
 #line 1925 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15735,7 +15735,7 @@ photo_set_editable_file (Photo* self,
 #line 1926 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = g_strdup ("backing:baseline");
 #line 1926 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp37_);
+			_vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp37_);
 #line 15738 "Photo.c"
 		}
 #line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15753,7 +15753,7 @@ photo_set_editable_file (Photo* self,
 #line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = g_strdup ("backing:source");
 #line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_);
+			_vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_);
 #line 15756 "Photo.c"
 		}
 #line 1931 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28285,7 +28285,7 @@ photo_reimport_editable (Photo* self,
 
 
 static void
-_vala_array_add107 (gchar** * array,
+_vala_array_add106 (gchar** * array,
                     int* length,
                     int* size,
                     gchar* value)
@@ -28307,7 +28307,7 @@ _vala_array_add107 (gchar** * array,
 
 
 static void
-_vala_array_add108 (gchar** * array,
+_vala_array_add107 (gchar** * array,
                     int* length,
                     int* size,
                     gchar* value)
@@ -28329,7 +28329,7 @@ _vala_array_add108 (gchar** * array,
 
 
 static void
-_vala_array_add109 (gchar** * array,
+_vala_array_add108 (gchar** * array,
                     int* length,
                     int* size,
                     gchar* value)
@@ -28351,7 +28351,7 @@ _vala_array_add109 (gchar** * array,
 
 
 static void
-_vala_array_add110 (gchar** * array,
+_vala_array_add109 (gchar** * array,
                     int* length,
                     int* size,
                     gchar* value)
@@ -28373,7 +28373,7 @@ _vala_array_add110 (gchar** * array,
 
 
 static void
-_vala_array_add111 (gchar** * array,
+_vala_array_add110 (gchar** * array,
                     int* length,
                     int* size,
                     gchar* value)
@@ -28395,7 +28395,7 @@ _vala_array_add111 (gchar** * array,
 
 
 static void
-_vala_array_add112 (gchar** * array,
+_vala_array_add111 (gchar** * array,
                     int* length,
                     int* size,
                     gchar* value)
@@ -29239,7 +29239,7 @@ photo_update_editable (Photo* self,
 #line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp99_ = g_strdup ("metadata:editable-timestamp");
 #line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp99_);
+		_vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp99_);
 #line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = alteration_list;
 #line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29247,7 +29247,7 @@ photo_update_editable (Photo* self,
 #line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = g_strdup ("metadata:baseline-timestamp");
 #line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp101_);
+		_vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp101_);
 #line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (photo_is_editable_source (self)) {
 #line 29250 "Photo.c"
@@ -29261,7 +29261,7 @@ photo_update_editable (Photo* self,
 #line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp103_ = g_strdup ("metadata:source-timestamp");
 #line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add109 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp103_);
+			_vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp103_);
 #line 29262 "Photo.c"
 		}
 	}
@@ -29293,7 +29293,7 @@ photo_update_editable (Photo* self,
 #line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp107_ = g_strdup ("image:editable");
 #line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add110 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp107_);
+		_vala_array_add109 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp107_);
 #line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp108_ = alteration_list;
 #line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29301,7 +29301,7 @@ photo_update_editable (Photo* self,
 #line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp109_ = g_strdup ("image:baseline");
 #line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add111 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp109_);
+		_vala_array_add110 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp109_);
 #line 4037 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (photo_is_editable_source (self)) {
 #line 29304 "Photo.c"
@@ -29315,7 +29315,7 @@ photo_update_editable (Photo* self,
 #line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp111_ = g_strdup ("image:source");
 #line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add112 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp111_);
+			_vala_array_add111 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp111_);
 #line 29316 "Photo.c"
 		}
 	}
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c
index c87391c..158acec 100644
--- a/src/PhotoMonitor.c
+++ b/src/PhotoMonitor.c
@@ -805,12 +805,12 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba
                                                          int* result_length1);
 gboolean photo_has_editable (Photo* self);
 GFile* photo_get_editable_file (Photo* self);
-static void _vala_array_add132 (GFile** * array,
+static void _vala_array_add131 (GFile** * array,
                          int* length,
                          int* size,
                          GFile* value);
 GeeCollection* photo_get_raw_developer_files (Photo* self);
-static void _vala_array_add133 (GFile** * array,
+static void _vala_array_add132 (GFile** * array,
                          int* length,
                          int* size,
                          GFile* value);
@@ -2853,7 +2853,7 @@ photo_monitor_real_candidates_for_unknown_file (MediaMonitor* base,
 
 
 static void
-_vala_array_add132 (GFile** * array,
+_vala_array_add131 (GFile** * array,
                     int* length,
                     int* size,
                     GFile* value)
@@ -2875,7 +2875,7 @@ _vala_array_add132 (GFile** * array,
 
 
 static void
-_vala_array_add133 (GFile** * array,
+_vala_array_add132 (GFile** * array,
                     int* length,
                     int* size,
                     GFile* value)
@@ -2981,7 +2981,7 @@ photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base,
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp5_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo));
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_vala_array_add132 (&files, &files_length1, &_files_size_, _tmp5_);
+		_vala_array_add131 (&files, &files_length1, &_files_size_, _tmp5_);
 #line 2984 "PhotoMonitor.c"
 	}
 #line 370 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -3039,7 +3039,7 @@ photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base,
 #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp16_ = _g_object_ref0 (_tmp15_);
 #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-				_vala_array_add133 (&files, &files_length1, &_files_size_, _tmp16_);
+				_vala_array_add132 (&files, &files_length1, &_files_size_, _tmp16_);
 #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_g_object_unref0 (f);
 #line 3044 "PhotoMonitor.c"
diff --git a/src/PhotoPage.c b/src/PhotoPage.c
index 8b5783a..5ba8350 100644
--- a/src/PhotoPage.c
+++ b/src/PhotoPage.c
@@ -2836,15 +2836,15 @@ void injection_group_add_menu_item (InjectionGroup* self,
                                     const gchar* name,
                                     const gchar* action,
                                     const gchar* accellerator);
-static void _vala_array_add86 (InjectionGroup** * array,
+static void _vala_array_add85 (InjectionGroup** * array,
                         int* length,
                         int* size,
                         InjectionGroup* value);
-static void _vala_array_add87 (InjectionGroup** * array,
+static void _vala_array_add86 (InjectionGroup** * array,
                         int* length,
                         int* size,
                         InjectionGroup* value);
-static void _vala_array_add88 (InjectionGroup** * array,
+static void _vala_array_add87 (InjectionGroup** * array,
                         int* length,
                         int* size,
                         InjectionGroup* value);
@@ -16258,7 +16258,7 @@ _injection_group_ref0 (gpointer self)
 
 
 static void
-_vala_array_add86 (InjectionGroup** * array,
+_vala_array_add85 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -16280,7 +16280,7 @@ _vala_array_add86 (InjectionGroup** * array,
 
 
 static void
-_vala_array_add87 (InjectionGroup** * array,
+_vala_array_add86 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -16302,7 +16302,7 @@ _vala_array_add87 (InjectionGroup** * array,
 
 
 static void
-_vala_array_add88 (InjectionGroup** * array,
+_vala_array_add87 (InjectionGroup** * array,
                    int* length,
                    int* size,
                    InjectionGroup* value)
@@ -16374,7 +16374,7 @@ library_photo_page_real_init_collect_injection_groups (Page* base,
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _injection_group_ref0 (print_group);
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add86 (&groups, &groups_length1, &_groups_size_, _tmp4_);
+	_vala_array_add85 (&groups, &groups_length1, &_groups_size_, _tmp4_);
 #line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = injection_group_new ("PublishPlaceholder");
 #line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16388,7 +16388,7 @@ library_photo_page_real_init_collect_injection_groups (Page* base,
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _injection_group_ref0 (publish_group);
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add87 (&groups, &groups_length1, &_groups_size_, _tmp7_);
+	_vala_array_add86 (&groups, &groups_length1, &_groups_size_, _tmp7_);
 #line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = injection_group_new ("SetBackgroundPlaceholder");
 #line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16402,7 +16402,7 @@ library_photo_page_real_init_collect_injection_groups (Page* base,
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _injection_group_ref0 (bg_group);
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add88 (&groups, &groups_length1, &_groups_size_, _tmp10_);
+	_vala_array_add87 (&groups, &groups_length1, &_groups_size_, _tmp10_);
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = groups;
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
diff --git a/src/Printing.c b/src/Printing.c
index 2e017b8..47e9298 100644
--- a/src/Printing.c
+++ b/src/Printing.c
@@ -708,6 +708,10 @@ GType progress_dialog_get_type (void) G_GNUC_CONST;
 #define PRINT_MANAGER_IMAGE_DISTANCE 0.24
 static PrintManager* print_manager_new (void);
 static PrintManager* print_manager_construct (GType object_type);
+static void _vala_array_add112 (StandardPrintSize** * array,
+                         int* length,
+                         int* size,
+                         StandardPrintSize* value);
 static void _vala_array_add113 (StandardPrintSize** * array,
                          int* length,
                          int* size,
@@ -764,10 +768,6 @@ static void _vala_array_add126 (StandardPrintSize** * array,
                          int* length,
                          int* size,
                          StandardPrintSize* value);
-static void _vala_array_add127 (StandardPrintSize** * array,
-                         int* length,
-                         int* size,
-                         StandardPrintSize* value);
 void print_manager_spool_photo (PrintManager* self,
                                 GeeCollection* to_print);
 gchar* data_object_get_name (DataObject* self);
@@ -5500,7 +5500,7 @@ print_manager_new (void)
 
 
 static void
-_vala_array_add113 (StandardPrintSize** * array,
+_vala_array_add112 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5522,7 +5522,7 @@ _vala_array_add113 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add114 (StandardPrintSize** * array,
+_vala_array_add113 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5544,7 +5544,7 @@ _vala_array_add114 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add115 (StandardPrintSize** * array,
+_vala_array_add114 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5566,7 +5566,7 @@ _vala_array_add115 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add116 (StandardPrintSize** * array,
+_vala_array_add115 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5588,7 +5588,7 @@ _vala_array_add116 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add117 (StandardPrintSize** * array,
+_vala_array_add116 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5610,7 +5610,7 @@ _vala_array_add117 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add118 (StandardPrintSize** * array,
+_vala_array_add117 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5632,7 +5632,7 @@ _vala_array_add118 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add119 (StandardPrintSize** * array,
+_vala_array_add118 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5654,7 +5654,7 @@ _vala_array_add119 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add120 (StandardPrintSize** * array,
+_vala_array_add119 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5676,7 +5676,7 @@ _vala_array_add120 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add121 (StandardPrintSize** * array,
+_vala_array_add120 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5698,7 +5698,7 @@ _vala_array_add121 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add122 (StandardPrintSize** * array,
+_vala_array_add121 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5720,7 +5720,7 @@ _vala_array_add122 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add123 (StandardPrintSize** * array,
+_vala_array_add122 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5742,7 +5742,7 @@ _vala_array_add123 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add124 (StandardPrintSize** * array,
+_vala_array_add123 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5764,7 +5764,7 @@ _vala_array_add124 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add125 (StandardPrintSize** * array,
+_vala_array_add124 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5786,7 +5786,7 @@ _vala_array_add125 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add126 (StandardPrintSize** * array,
+_vala_array_add125 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5808,7 +5808,7 @@ _vala_array_add126 (StandardPrintSize** * array,
 
 
 static void
-_vala_array_add127 (StandardPrintSize** * array,
+_vala_array_add126 (StandardPrintSize** * array,
                     int* length,
                     int* size,
                     StandardPrintSize* value)
@@ -5946,7 +5946,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = standard_print_size_new (_ ("Wallet (2 × 3 in.)"), &_tmp3_, &_tmp4_);
 #line 792 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add113 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp5_);
+		_vala_array_add112 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp5_);
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = self->priv->standard_sizes;
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5958,7 +5958,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp9_ = standard_print_size_new (_ ("Notecard (3 × 5 in.)"), &_tmp7_, &_tmp8_);
 #line 795 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add114 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp9_);
+		_vala_array_add113 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp9_);
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp10_ = self->priv->standard_sizes;
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5970,7 +5970,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp13_ = standard_print_size_new (_ ("4 × 6 in."), &_tmp11_, &_tmp12_);
 #line 798 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add115 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp13_);
+		_vala_array_add114 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp13_);
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp14_ = self->priv->standard_sizes;
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5982,7 +5982,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp17_ = standard_print_size_new (_ ("5 × 7 in."), &_tmp15_, &_tmp16_);
 #line 801 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add116 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp17_);
+		_vala_array_add115 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp17_);
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = self->priv->standard_sizes;
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5994,7 +5994,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp21_ = standard_print_size_new (_ ("8 × 10 in."), &_tmp19_, &_tmp20_);
 #line 804 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add117 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp21_);
+		_vala_array_add116 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp21_);
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = self->priv->standard_sizes;
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6006,7 +6006,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp25_ = standard_print_size_new (_ ("11 × 14 in."), &_tmp23_, &_tmp24_);
 #line 807 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add118 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp25_);
+		_vala_array_add117 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp25_);
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = self->priv->standard_sizes;
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6018,7 +6018,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = standard_print_size_new (_ ("16 × 20 in."), &_tmp27_, &_tmp28_);
 #line 810 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add119 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp29_);
+		_vala_array_add118 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp29_);
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp30_ = self->priv->standard_sizes;
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6030,7 +6030,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp33_ = standard_print_size_new ("-", &_tmp31_, &_tmp32_);
 #line 813 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add120 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp33_);
+		_vala_array_add119 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp33_);
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp34_ = self->priv->standard_sizes;
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6042,7 +6042,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp37_ = standard_print_size_new (_ ("Metric Wallet (9 × 13 cm)"), &_tmp35_, &_tmp36_);
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add121 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp37_);
+		_vala_array_add120 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp37_);
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp38_ = self->priv->standard_sizes;
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6054,7 +6054,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp41_ = standard_print_size_new (_ ("Postcard (10 × 15 cm)"), &_tmp39_, &_tmp40_);
 #line 819 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add122 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp41_);
+		_vala_array_add121 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp41_);
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp42_ = self->priv->standard_sizes;
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6066,7 +6066,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp45_ = standard_print_size_new (_ ("13 × 18 cm"), &_tmp43_, &_tmp44_);
 #line 822 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add123 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp45_);
+		_vala_array_add122 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp45_);
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp46_ = self->priv->standard_sizes;
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6078,7 +6078,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp49_ = standard_print_size_new (_ ("18 × 24 cm"), &_tmp47_, &_tmp48_);
 #line 825 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add124 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp49_);
+		_vala_array_add123 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp49_);
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp50_ = self->priv->standard_sizes;
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6090,7 +6090,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp53_ = standard_print_size_new (_ ("20 × 30 cm"), &_tmp51_, &_tmp52_);
 #line 828 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add125 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp53_);
+		_vala_array_add124 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp53_);
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp54_ = self->priv->standard_sizes;
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6102,7 +6102,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp57_ = standard_print_size_new (_ ("24 × 40 cm"), &_tmp55_, &_tmp56_);
 #line 831 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add126 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp57_);
+		_vala_array_add125 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp57_);
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp58_ = self->priv->standard_sizes;
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6114,7 +6114,7 @@ print_manager_get_standard_sizes (PrintManager* self,
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp61_ = standard_print_size_new (_ ("30 × 40 cm"), &_tmp59_, &_tmp60_);
 #line 834 "/home/jens/Source/shotwell/src/Printing.vala"
-		_vala_array_add127 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp61_);
+		_vala_array_add126 (&self->priv->standard_sizes, &self->priv->standard_sizes_length1, &self->priv->_standard_sizes_size_, _tmp61_);
 #line 6118 "Printing.c"
 	}
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
diff --git a/src/SearchFilter.c b/src/SearchFilter.c
index 59ae93b..a3a1b0f 100644
--- a/src/SearchFilter.c
+++ b/src/SearchFilter.c
@@ -1669,11 +1669,11 @@ static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_sa
 static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_construct (GType object_type,
                                                                                                                    SavedSearch* search,
                                                                                                                    const gchar* name);
-static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array,
+static void _vala_array_add133 (SearchFilterToolbarSavedSearchPopoverDataButton** * array,
                          int* length,
                          int* size,
                          SearchFilterToolbarSavedSearchPopoverDataButton* value);
-static void _vala_array_add135 (SearchFilterToolbarSavedSearchPopoverDataButton** * array,
+static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array,
                          int* length,
                          int* size,
                          SearchFilterToolbarSavedSearchPopoverDataButton* value);
@@ -8574,7 +8574,7 @@ _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed
 
 
 static void
-_vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array,
+_vala_array_add133 (SearchFilterToolbarSavedSearchPopoverDataButton** * array,
                     int* length,
                     int* size,
                     SearchFilterToolbarSavedSearchPopoverDataButton* value)
@@ -8596,7 +8596,7 @@ _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array,
 
 
 static void
-_vala_array_add135 (SearchFilterToolbarSavedSearchPopoverDataButton** * array,
+_vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton** * array,
                     int* length,
                     int* size,
                     SearchFilterToolbarSavedSearchPopoverDataButton* value)
@@ -8824,7 +8824,7 @@ search_filter_toolbar_saved_search_popover_construct (GType object_type,
 #line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp31_ = _g_object_ref0 (_tmp30_);
 #line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_vala_array_add134 (&self->priv->delete_buttons, &self->priv->delete_buttons_length1, &self->priv->_delete_buttons_size_, _tmp31_);
+			_vala_array_add133 (&self->priv->delete_buttons, &self->priv->delete_buttons_length1, &self->priv->_delete_buttons_size_, _tmp31_);
 #line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp32_ = search;
 #line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8852,7 +8852,7 @@ search_filter_toolbar_saved_search_popover_construct (GType object_type,
 #line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp39_ = _g_object_ref0 (_tmp38_);
 #line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_vala_array_add135 (&self->priv->edit_buttons, &self->priv->edit_buttons_length1, &self->priv->_edit_buttons_size_, _tmp39_);
+			_vala_array_add134 (&self->priv->edit_buttons, &self->priv->edit_buttons_length1, &self->priv->_edit_buttons_size_, _tmp39_);
 #line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp40_ = self->priv->list_box;
 #line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
diff --git a/src/Tag.c b/src/Tag.c
index f3b0e2c..a4b9131 100644
--- a/src/Tag.c
+++ b/src/Tag.c
@@ -1083,7 +1083,7 @@ gchar* prepare_input_text (const gchar* text,
 gchar** tag_prep_tag_names (gchar** names,
                             int names_length1,
                             int* result_length1);
-static void _vala_array_add128 (gchar** * array,
+static void _vala_array_add127 (gchar** * array,
                          int* length,
                          int* size,
                          gchar* value);
@@ -5374,7 +5374,7 @@ tag_prep_tag_name (const gchar* name)
 
 
 static void
-_vala_array_add128 (gchar** * array,
+_vala_array_add127 (gchar** * array,
                     int* length,
                     int* size,
                     gchar* value)
@@ -5480,7 +5480,7 @@ tag_prep_tag_names (gchar** names,
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp10_ = g_strdup (_tmp9_);
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
-					_vala_array_add128 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+					_vala_array_add127 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 5485 "Tag.c"
 				}
 #line 662 "/home/jens/Source/shotwell/src/Tag.vala"
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index f0f37e6..d35655d 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -22,7 +22,6 @@
 #include <gtk/gtk.h>
 #include <gphoto2/gphoto2-result.h>
 #include <gphoto2/gphoto2-port-result.h>
-#include <stdio.h>
 #include <gphoto2/gphoto2-port-info-list.h>
 #include <gphoto2/gphoto2-list.h>
 #include <glib/gi18n-lib.h>
@@ -99,8 +98,8 @@ typedef struct _LibraryWindow LibraryWindow;
 typedef struct _LibraryWindowClass LibraryWindowClass;
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 #define _camera_table_unref0(var) ((var == NULL) ? NULL : (var = (camera_table_unref (var), NULL)))
-#define __g_list_free__g_object_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__g_object_unref0_ (var), NULL)))
 #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
+#define __g_list_free__g_object_unref0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__g_object_unref0_ (var), NULL)))
 #define _gp_port_info_list_free0(var) ((var == NULL) ? NULL : (var = (gp_port_info_list_free (var), NULL)))
 #define _gp_list_unref0(var) ((var == NULL) ? NULL : (var = (gp_list_unref (var), NULL)))
 #define _discovered_camera_unref0(var) ((var == NULL) ? NULL : (var = (discovered_camera_unref (var), NULL)))
@@ -269,27 +268,15 @@ static void camera_table_do_op (CameraTable* self,
                          int res,
                          const gchar* op,
                          GError** error);
-static gchar** camera_table_get_all_usb_cameras (CameraTable* self,
-                                          int* result_length1);
-static void _vala_array_add69 (gchar** * array,
-                        int* length,
-                        int* size,
-                        gchar* value);
-static void _g_object_unref0_ (gpointer var);
-static inline void _g_list_free__g_object_unref0_ (GList* self);
-static gboolean camera_table_usb_esp (CameraTable* self,
-                               gint current_camera_count,
-                               gchar** usb_cameras,
-                               int usb_cameras_length1,
-                               const gchar* port,
-                               gchar* * full_port);
 gchar* camera_table_get_port_uri (const gchar* port);
 gchar* camera_table_get_port_path (const gchar* port);
 static gchar* camera_table_get_name_for_uuid (CameraTable* self,
                                        const gchar* uuid);
+static void _g_object_unref0_ (gpointer var);
+static inline void _g_list_free__g_object_unref0_ (GList* self);
 static gchar* camera_table_get_icon_for_uuid (CameraTable* self,
                                        const gchar* uuid);
-static void _vala_array_add70 (DiscoveredCamera** * array,
+static void _vala_array_add69 (DiscoveredCamera** * array,
                         int* length,
                         int* size,
                         DiscoveredCamera* value);
@@ -317,7 +304,7 @@ _GPHOTO_REF_CAMERA0 (gpointer self)
 {
 #line 14 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self ? GPHOTO_REF_CAMERA (self) : NULL;
-#line 321 "CameraTable.c"
+#line 308 "CameraTable.c"
 }
 
 
@@ -367,7 +354,7 @@ discovered_camera_construct (GType object_type,
 	self->icon = _tmp3_;
 #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self;
-#line 371 "CameraTable.c"
+#line 358 "CameraTable.c"
 }
 
 
@@ -379,7 +366,7 @@ discovered_camera_new (Camera* gcamera,
 {
 #line 13 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return discovered_camera_construct (TYPE_DISCOVERED_CAMERA, gcamera, uri, display_name, icon);
-#line 383 "CameraTable.c"
+#line 370 "CameraTable.c"
 }
 
 
@@ -388,7 +375,7 @@ value_discovered_camera_init (GValue* value)
 {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	value->data[0].v_pointer = NULL;
-#line 392 "CameraTable.c"
+#line 379 "CameraTable.c"
 }
 
 
@@ -399,7 +386,7 @@ value_discovered_camera_free_value (GValue* value)
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		discovered_camera_unref (value->data[0].v_pointer);
-#line 403 "CameraTable.c"
+#line 390 "CameraTable.c"
 	}
 }
 
@@ -412,11 +399,11 @@ value_discovered_camera_copy_value (const GValue* src_value,
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		dest_value->data[0].v_pointer = discovered_camera_ref (src_value->data[0].v_pointer);
-#line 416 "CameraTable.c"
+#line 403 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 420 "CameraTable.c"
+#line 407 "CameraTable.c"
 	}
 }
 
@@ -426,7 +413,7 @@ value_discovered_camera_peek_pointer (const GValue* value)
 {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return value->data[0].v_pointer;
-#line 430 "CameraTable.c"
+#line 417 "CameraTable.c"
 }
 
 
@@ -438,30 +425,30 @@ value_discovered_camera_collect_value (GValue* value,
 {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (collect_values[0].v_pointer) {
-#line 442 "CameraTable.c"
+#line 429 "CameraTable.c"
 		DiscoveredCamera * object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 449 "CameraTable.c"
+#line 436 "CameraTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 453 "CameraTable.c"
+#line 440 "CameraTable.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = discovered_camera_ref (object);
-#line 457 "CameraTable.c"
+#line 444 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 461 "CameraTable.c"
+#line 448 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 465 "CameraTable.c"
+#line 452 "CameraTable.c"
 }
 
 
@@ -477,25 +464,25 @@ value_discovered_camera_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 481 "CameraTable.c"
+#line 468 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = NULL;
-#line 487 "CameraTable.c"
+#line 474 "CameraTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = value->data[0].v_pointer;
-#line 491 "CameraTable.c"
+#line 478 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = discovered_camera_ref (value->data[0].v_pointer);
-#line 495 "CameraTable.c"
+#line 482 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 499 "CameraTable.c"
+#line 486 "CameraTable.c"
 }
 
 
@@ -515,7 +502,7 @@ param_spec_discovered_camera (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return G_PARAM_SPEC (spec);
-#line 519 "CameraTable.c"
+#line 506 "CameraTable.c"
 }
 
 
@@ -526,7 +513,7 @@ value_get_discovered_camera (const GValue* value)
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DISCOVERED_CAMERA), NULL);
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return value->data[0].v_pointer;
-#line 530 "CameraTable.c"
+#line 517 "CameraTable.c"
 }
 
 
@@ -549,17 +536,17 @@ value_set_discovered_camera (GValue* value,
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		discovered_camera_ref (value->data[0].v_pointer);
-#line 553 "CameraTable.c"
+#line 540 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 557 "CameraTable.c"
+#line 544 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		discovered_camera_unref (old);
-#line 563 "CameraTable.c"
+#line 550 "CameraTable.c"
 	}
 }
 
@@ -581,17 +568,17 @@ value_take_discovered_camera (GValue* value,
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 585 "CameraTable.c"
+#line 572 "CameraTable.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 589 "CameraTable.c"
+#line 576 "CameraTable.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		discovered_camera_unref (old);
-#line 595 "CameraTable.c"
+#line 582 "CameraTable.c"
 	}
 }
 
@@ -603,7 +590,7 @@ discovered_camera_class_init (DiscoveredCameraClass * klass)
 	discovered_camera_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	((DiscoveredCameraClass *) klass)->finalize = discovered_camera_finalize;
-#line 607 "CameraTable.c"
+#line 594 "CameraTable.c"
 }
 
 
@@ -612,7 +599,7 @@ discovered_camera_instance_init (DiscoveredCamera * self)
 {
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	self->ref_count = 1;
-#line 616 "CameraTable.c"
+#line 603 "CameraTable.c"
 }
 
 
@@ -632,7 +619,7 @@ discovered_camera_finalize (DiscoveredCamera * obj)
 	_g_free0 (self->display_name);
 #line 11 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_g_free0 (self->icon);
-#line 636 "CameraTable.c"
+#line 623 "CameraTable.c"
 }
 
 
@@ -661,7 +648,7 @@ discovered_camera_ref (gpointer instance)
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return instance;
-#line 665 "CameraTable.c"
+#line 652 "CameraTable.c"
 }
 
 
@@ -676,7 +663,7 @@ discovered_camera_unref (gpointer instance)
 		DISCOVERED_CAMERA_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 680 "CameraTable.c"
+#line 667 "CameraTable.c"
 	}
 }
 
@@ -686,7 +673,7 @@ _camera_table_on_update_cameras_one_shot_callback (gpointer self)
 {
 #line 42 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_on_update_cameras ((CameraTable*) self);
-#line 690 "CameraTable.c"
+#line 677 "CameraTable.c"
 }
 
 
@@ -698,7 +685,7 @@ _camera_table_on_udev_event_g_udev_client_uevent (GUdevClient* _sender,
 {
 #line 46 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_on_udev_event ((CameraTable*) self, action, device);
-#line 702 "CameraTable.c"
+#line 689 "CameraTable.c"
 }
 
 
@@ -709,7 +696,7 @@ _camera_table_on_volume_changed_g_volume_monitor_volume_changed (GVolumeMonitor*
 {
 #line 48 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 713 "CameraTable.c"
+#line 700 "CameraTable.c"
 }
 
 
@@ -720,7 +707,7 @@ _camera_table_on_volume_changed_g_volume_monitor_volume_added (GVolumeMonitor* _
 {
 #line 49 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_on_volume_changed ((CameraTable*) self, volume);
-#line 724 "CameraTable.c"
+#line 711 "CameraTable.c"
 }
 
 
@@ -731,7 +718,7 @@ _camera_table_delayed_init_gsource_func (gpointer self)
 	result = camera_table_delayed_init ((CameraTable*) self);
 #line 54 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 735 "CameraTable.c"
+#line 722 "CameraTable.c"
 }
 
 
@@ -774,7 +761,7 @@ camera_table_construct (GType object_type)
 	g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, _camera_table_delayed_init_gsource_func, camera_table_ref (self), camera_table_unref);
 #line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self;
-#line 778 "CameraTable.c"
+#line 765 "CameraTable.c"
 }
 
 
@@ -783,7 +770,7 @@ camera_table_new (void)
 {
 #line 41 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return camera_table_construct (TYPE_CAMERA_TABLE);
-#line 787 "CameraTable.c"
+#line 774 "CameraTable.c"
 }
 
 
@@ -806,17 +793,17 @@ camera_table_delayed_init (CameraTable* self)
 	library_window_set_page_switching_enabled (_tmp1_, FALSE);
 #line 60 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_g_object_unref0 (_tmp1_);
-#line 810 "CameraTable.c"
+#line 797 "CameraTable.c"
 	{
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_init_camera_table (self, &_inner_error_);
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 816 "CameraTable.c"
+#line 803 "CameraTable.c"
 			gboolean _tmp2_ = FALSE;
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 820 "CameraTable.c"
+#line 807 "CameraTable.c"
 				goto __catch64_gphoto_error;
 			}
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -825,7 +812,7 @@ camera_table_delayed_init (CameraTable* self)
 			g_clear_error (&_inner_error_);
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return _tmp2_;
-#line 829 "CameraTable.c"
+#line 816 "CameraTable.c"
 		}
 	}
 	goto __finally64;
@@ -850,12 +837,12 @@ camera_table_delayed_init (CameraTable* self)
 		_g_error_free0 (err);
 #line 67 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return result;
-#line 854 "CameraTable.c"
+#line 841 "CameraTable.c"
 	}
 	__finally64:
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 859 "CameraTable.c"
+#line 846 "CameraTable.c"
 		gboolean _tmp5_ = FALSE;
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -863,18 +850,18 @@ camera_table_delayed_init (CameraTable* self)
 		g_clear_error (&_inner_error_);
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return _tmp5_;
-#line 867 "CameraTable.c"
+#line 854 "CameraTable.c"
 	}
 	{
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_update_camera_table (self, &_inner_error_);
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 874 "CameraTable.c"
+#line 861 "CameraTable.c"
 			gboolean _tmp6_ = FALSE;
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 878 "CameraTable.c"
+#line 865 "CameraTable.c"
 				goto __catch65_gphoto_error;
 			}
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -883,7 +870,7 @@ camera_table_delayed_init (CameraTable* self)
 			g_clear_error (&_inner_error_);
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return _tmp6_;
-#line 887 "CameraTable.c"
+#line 874 "CameraTable.c"
 		}
 	}
 	goto __finally65;
@@ -904,12 +891,12 @@ camera_table_delayed_init (CameraTable* self)
 		g_warning ("CameraTable.vala:73: Unable to update camera table: %s", _tmp8_);
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_error_free0 (err);
-#line 908 "CameraTable.c"
+#line 895 "CameraTable.c"
 	}
 	__finally65:
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 913 "CameraTable.c"
+#line 900 "CameraTable.c"
 		gboolean _tmp9_ = FALSE;
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -917,7 +904,7 @@ camera_table_delayed_init (CameraTable* self)
 		g_clear_error (&_inner_error_);
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return _tmp9_;
-#line 921 "CameraTable.c"
+#line 908 "CameraTable.c"
 	}
 #line 78 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp10_ = app_window_get_instance ();
@@ -931,7 +918,7 @@ camera_table_delayed_init (CameraTable* self)
 	result = FALSE;
 #line 79 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 935 "CameraTable.c"
+#line 922 "CameraTable.c"
 }
 
 
@@ -940,7 +927,7 @@ _camera_table_ref0 (gpointer self)
 {
 #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self ? camera_table_ref (self) : NULL;
-#line 944 "CameraTable.c"
+#line 931 "CameraTable.c"
 }
 
 
@@ -955,7 +942,7 @@ camera_table_get_instance (void)
 	_tmp0_ = camera_table_instance;
 #line 83 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (_tmp0_ == NULL) {
-#line 959 "CameraTable.c"
+#line 946 "CameraTable.c"
 		CameraTable* _tmp1_;
 #line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp1_ = camera_table_new ();
@@ -963,7 +950,7 @@ camera_table_get_instance (void)
 		_camera_table_unref0 (camera_table_instance);
 #line 84 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_instance = _tmp1_;
-#line 967 "CameraTable.c"
+#line 954 "CameraTable.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp2_ = camera_table_instance;
@@ -973,7 +960,7 @@ camera_table_get_instance (void)
 	result = _tmp3_;
 #line 86 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 977 "CameraTable.c"
+#line 964 "CameraTable.c"
 }
 
 
@@ -996,7 +983,7 @@ camera_table_get_cameras (CameraTable* self)
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
 #line 90 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1000 "CameraTable.c"
+#line 987 "CameraTable.c"
 }
 
 
@@ -1019,7 +1006,7 @@ camera_table_get_count (CameraTable* self)
 	result = _tmp2_;
 #line 94 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1023 "CameraTable.c"
+#line 1010 "CameraTable.c"
 }
 
 
@@ -1042,7 +1029,7 @@ camera_table_get_for_uri (CameraTable* self,
 	result = (DiscoveredCamera*) _tmp1_;
 #line 98 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1046 "CameraTable.c"
+#line 1033 "CameraTable.c"
 }
 
 
@@ -1059,7 +1046,7 @@ camera_table_do_op (CameraTable* self,
 	g_return_if_fail (op != NULL);
 #line 102 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (res != GP_OK) {
-#line 1063 "CameraTable.c"
+#line 1050 "CameraTable.c"
 		const gchar* _tmp0_;
 		GError* _tmp1_;
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1074,7 +1061,7 @@ camera_table_do_op (CameraTable* self,
 			g_propagate_error (error, _inner_error_);
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 1078 "CameraTable.c"
+#line 1065 "CameraTable.c"
 		} else {
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1082,7 +1069,7 @@ camera_table_do_op (CameraTable* self,
 			g_clear_error (&_inner_error_);
 #line 103 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 1086 "CameraTable.c"
+#line 1073 "CameraTable.c"
 		}
 	}
 }
@@ -1115,7 +1102,7 @@ camera_table_init_camera_table (CameraTable* self,
 			g_propagate_error (error, _inner_error_);
 #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 1119 "CameraTable.c"
+#line 1106 "CameraTable.c"
 		} else {
 #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1123,7 +1110,7 @@ camera_table_init_camera_table (CameraTable* self,
 			g_clear_error (&_inner_error_);
 #line 107 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 1127 "CameraTable.c"
+#line 1114 "CameraTable.c"
 		}
 	}
 #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1140,7 +1127,7 @@ camera_table_init_camera_table (CameraTable* self,
 			g_propagate_error (error, _inner_error_);
 #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 1144 "CameraTable.c"
+#line 1131 "CameraTable.c"
 		} else {
 #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1148,490 +1135,26 @@ camera_table_init_camera_table (CameraTable* self,
 			g_clear_error (&_inner_error_);
 #line 108 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 1152 "CameraTable.c"
+#line 1139 "CameraTable.c"
 		}
 	}
 }
 
 
-static gpointer
-_g_object_ref0 (gpointer self)
-{
-#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 1163 "CameraTable.c"
-}
-
-
-static void
-_vala_array_add69 (gchar** * array,
-                   int* length,
-                   int* size,
-                   gchar* value)
-{
-#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	if ((*length) == (*size)) {
-#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 1179 "CameraTable.c"
-	}
-#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	(*array)[(*length)++] = value;
-#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	(*array)[*length] = NULL;
-#line 1185 "CameraTable.c"
-}
-
-
-static void
-_g_object_unref0_ (gpointer var)
-{
-#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 1194 "CameraTable.c"
-}
-
-
-static inline void
-_g_list_free__g_object_unref0_ (GList* self)
-{
-#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	g_list_free_full (self, (GDestroyNotify) _g_object_unref0_);
-#line 1203 "CameraTable.c"
-}
-
-
-static gchar**
-camera_table_get_all_usb_cameras (CameraTable* self,
-                                  int* result_length1)
-{
-	gchar** result = NULL;
-	gchar** cameras = NULL;
-	gchar** _tmp0_;
-	gint cameras_length1;
-	gint _cameras_size_;
-	GList* device_list = NULL;
-	GUdevClient* _tmp1_;
-	GList* _tmp2_;
-	GList* _tmp3_;
-	gchar** _tmp22_;
-	gint _tmp22__length1;
-#line 111 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
-#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp0_ = g_new0 (gchar*, 0 + 1);
-#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	cameras = _tmp0_;
-#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	cameras_length1 = 0;
-#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_cameras_size_ = cameras_length1;
-#line 114 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp1_ = self->priv->client;
-#line 114 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp2_ = g_udev_client_query_by_subsystem (_tmp1_, NULL);
-#line 114 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	device_list = _tmp2_;
-#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp3_ = device_list;
-#line 1240 "CameraTable.c"
-	{
-		GList* device_collection = NULL;
-		GList* device_it = NULL;
-#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		device_collection = _tmp3_;
-#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1248 "CameraTable.c"
-			GUdevDevice* _tmp4_;
-			GUdevDevice* device = NULL;
-#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp4_ = _g_object_ref0 ((GUdevDevice*) device_it->data);
-#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			device = _tmp4_;
-#line 1255 "CameraTable.c"
-			{
-				gchar* device_file = NULL;
-				GUdevDevice* _tmp5_;
-				const gchar* _tmp6_;
-				gchar* _tmp7_;
-				gboolean _tmp8_ = FALSE;
-				gboolean _tmp9_ = FALSE;
-				const gchar* _tmp10_;
-#line 116 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp5_ = device;
-#line 116 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp6_ = g_udev_device_get_device_file (_tmp5_);
-#line 116 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp7_ = g_strdup (_tmp6_);
-#line 116 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				device_file = _tmp7_;
-#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp10_ = device_file;
-#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				if (_tmp10_ != NULL) {
-#line 1276 "CameraTable.c"
-					GUdevDevice* _tmp11_;
-#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp11_ = device;
-#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp9_ = g_udev_device_has_property (_tmp11_, "ID_GPHOTO2");
-#line 1282 "CameraTable.c"
-				} else {
-#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp9_ = FALSE;
-#line 1286 "CameraTable.c"
-				}
-#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				if (_tmp9_) {
-#line 1290 "CameraTable.c"
-					GUdevDevice* _tmp12_;
-#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp12_ = device;
-#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp8_ = g_udev_device_has_property (_tmp12_, "GPHOTO2_DRIVER");
-#line 1296 "CameraTable.c"
-				} else {
-#line 120 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp8_ = FALSE;
-#line 1300 "CameraTable.c"
-				}
-#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				if (_tmp8_) {
-#line 1304 "CameraTable.c"
-					gint camera_bus = 0;
-					gint camera_device = 0;
-					const gchar* _tmp13_;
-					gchar* camera = NULL;
-					gint _tmp15_;
-					gint _tmp16_;
-					gchar* _tmp17_;
-					const gchar* _tmp18_;
-					gchar** _tmp19_;
-					gint _tmp19__length1;
-					const gchar* _tmp20_;
-					gchar* _tmp21_;
-#line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp13_ = device_file;
-#line 128 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					if (sscanf (_tmp13_, "/dev/bus/usb/%d/%d", &camera_bus, &camera_device) < 2) {
-#line 1321 "CameraTable.c"
-						const gchar* _tmp14_;
-#line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						_tmp14_ = device_file;
-#line 129 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						g_critical ("CameraTable.vala:129: get_all_usb_cameras: Failed to scanf device file" \
-" %s", _tmp14_);
-#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						_g_free0 (device_file);
-#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						_g_object_unref0 (device);
-#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						continue;
-#line 1333 "CameraTable.c"
-					}
-#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp15_ = camera_bus;
-#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp16_ = camera_device;
-#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp17_ = g_strdup_printf ("usb:%.3d,%.3d", _tmp15_, _tmp16_);
-#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					camera = _tmp17_;
-#line 134 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp18_ = camera;
-#line 134 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					g_debug ("CameraTable.vala:134: USB camera detected at %s", _tmp18_);
-#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp19_ = cameras;
-#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp19__length1 = cameras_length1;
-#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp20_ = camera;
-#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp21_ = g_strdup (_tmp20_);
-#line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_vala_array_add69 (&cameras, &cameras_length1, &_cameras_size_, _tmp21_);
-#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_g_free0 (camera);
-#line 1359 "CameraTable.c"
-				}
-#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_g_free0 (device_file);
-#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_g_object_unref0 (device);
-#line 1365 "CameraTable.c"
-			}
-		}
-	}
-#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp22_ = cameras;
-#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp22__length1 = cameras_length1;
-#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	if (result_length1) {
-#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		*result_length1 = _tmp22__length1;
-#line 1377 "CameraTable.c"
-	}
-#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	result = _tmp22_;
-#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	__g_list_free__g_object_unref0_0 (device_list);
-#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	return result;
-#line 1385 "CameraTable.c"
-}
-
-
-static gboolean
-camera_table_usb_esp (CameraTable* self,
-                      gint current_camera_count,
-                      gchar** usb_cameras,
-                      int usb_cameras_length1,
-                      const gchar* port,
-                      gchar* * full_port)
-{
-	gchar* _vala_full_port = NULL;
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gint bus = 0;
-	gint device = 0;
-#line 150 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	g_return_val_if_fail (IS_CAMERA_TABLE (self), FALSE);
-#line 150 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	g_return_val_if_fail (port != NULL, FALSE);
-#line 153 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_vala_assert (current_camera_count > 0, "current_camera_count > 0");
-#line 155 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	g_debug ("CameraTable.vala:155: USB ESP: current_camera_count=%d port=%s", current_camera_count, port);
-#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_g_free0 (_vala_full_port);
-#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_vala_full_port = NULL;
-#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	if (current_camera_count == 1) {
-#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp0_ = usb_cameras_length1 == 1;
-#line 1418 "CameraTable.c"
-	} else {
-#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp0_ = FALSE;
-#line 1422 "CameraTable.c"
-	}
-#line 160 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	if (_tmp0_) {
-#line 1426 "CameraTable.c"
-		const gchar* _tmp1_;
-		gchar* _tmp2_;
-		const gchar* _tmp3_;
-#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp1_ = usb_cameras[0];
-#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp2_ = g_strdup (_tmp1_);
-#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_g_free0 (_vala_full_port);
-#line 161 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_vala_full_port = _tmp2_;
-#line 163 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp3_ = _vala_full_port;
-#line 163 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		g_debug ("CameraTable.vala:163: USB ESP: port=%s full_port=%s", port, _tmp3_);
-#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		result = TRUE;
-#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		if (full_port) {
-#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			*full_port = _vala_full_port;
-#line 1448 "CameraTable.c"
-		} else {
-#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_g_free0 (_vala_full_port);
-#line 1452 "CameraTable.c"
-		}
-#line 165 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		return result;
-#line 1456 "CameraTable.c"
-	}
-#line 169 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	if (g_strcmp0 (port, "usb:") == 0) {
-#line 170 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		g_debug ("CameraTable.vala:170: USB ESP: Skipping %s", port);
-#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		result = FALSE;
-#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		if (full_port) {
-#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			*full_port = _vala_full_port;
-#line 1468 "CameraTable.c"
-		} else {
-#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_g_free0 (_vala_full_port);
-#line 1472 "CameraTable.c"
-		}
-#line 172 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		return result;
-#line 1476 "CameraTable.c"
-	}
-#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	if (sscanf (port, "usb:%d,%d", &bus, &device) < 2) {
-#line 178 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		g_critical ("CameraTable.vala:178: USB ESP: Failed to scanf %s", port);
-#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		result = FALSE;
-#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		if (full_port) {
-#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			*full_port = _vala_full_port;
-#line 1488 "CameraTable.c"
-		} else {
-#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_g_free0 (_vala_full_port);
-#line 1492 "CameraTable.c"
-		}
-#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		return result;
-#line 1496 "CameraTable.c"
-	}
-	{
-		gchar** usb_camera_collection = NULL;
-		gint usb_camera_collection_length1 = 0;
-		gint _usb_camera_collection_size_ = 0;
-		gint usb_camera_it = 0;
-#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		usb_camera_collection = usb_cameras;
-#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		usb_camera_collection_length1 = usb_cameras_length1;
-#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		for (usb_camera_it = 0; usb_camera_it < usb_cameras_length1; usb_camera_it = usb_camera_it + 1) {
-#line 1509 "CameraTable.c"
-			gchar* _tmp4_;
-			gchar* usb_camera = NULL;
-#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp4_ = g_strdup (usb_camera_collection[usb_camera_it]);
-#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			usb_camera = _tmp4_;
-#line 1516 "CameraTable.c"
-			{
-				gint camera_bus = 0;
-				gint camera_device = 0;
-				const gchar* _tmp5_;
-				gboolean _tmp7_ = FALSE;
-				gint _tmp8_;
-				gint _tmp9_;
-#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp5_ = usb_camera;
-#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				if (sscanf (_tmp5_, "usb:%d,%d", &camera_bus, &camera_device) < 2) {
-#line 1528 "CameraTable.c"
-					const gchar* _tmp6_;
-#line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp6_ = usb_camera;
-#line 186 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					g_critical ("CameraTable.vala:186: USB ESP: Failed to scanf %s", _tmp6_);
-#line 188 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_g_free0 (usb_camera);
-#line 188 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					continue;
-#line 1538 "CameraTable.c"
-				}
-#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp8_ = bus;
-#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp9_ = camera_bus;
-#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				if (_tmp8_ == _tmp9_) {
-#line 1546 "CameraTable.c"
-					gint _tmp10_;
-					gint _tmp11_;
-#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp10_ = device;
-#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp11_ = camera_device;
-#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp7_ = _tmp10_ == _tmp11_;
-#line 1555 "CameraTable.c"
-				} else {
-#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp7_ = FALSE;
-#line 1559 "CameraTable.c"
-				}
-#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				if (_tmp7_) {
-#line 1563 "CameraTable.c"
-					gchar* _tmp12_;
-					const gchar* _tmp13_;
-#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp12_ = g_strdup (port);
-#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_g_free0 (_vala_full_port);
-#line 192 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_vala_full_port = _tmp12_;
-#line 194 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp13_ = _vala_full_port;
-#line 194 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					g_debug ("CameraTable.vala:194: USB ESP: port=%s full_port=%s", port, _tmp13_);
-#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					result = TRUE;
-#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_g_free0 (usb_camera);
-#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					if (full_port) {
-#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						*full_port = _vala_full_port;
-#line 1584 "CameraTable.c"
-					} else {
-#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						_g_free0 (_vala_full_port);
-#line 1588 "CameraTable.c"
-					}
-#line 196 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					return result;
-#line 1592 "CameraTable.c"
-				}
-#line 183 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_g_free0 (usb_camera);
-#line 1596 "CameraTable.c"
-			}
-		}
-	}
-#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	g_debug ("CameraTable.vala:200: USB ESP: No matching bus/device found for port=%" \
-"s", port);
-#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	result = FALSE;
-#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	if (full_port) {
-#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		*full_port = _vala_full_port;
-#line 1608 "CameraTable.c"
-	} else {
-#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_g_free0 (_vala_full_port);
-#line 1612 "CameraTable.c"
-	}
-#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	return result;
-#line 1616 "CameraTable.c"
-}
-
-
 gchar*
 camera_table_get_port_uri (const gchar* port)
 {
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 205 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 111 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (port != NULL, NULL);
-#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp0_ = g_strdup_printf ("gphoto2://[%s]/", port);
-#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = _tmp0_;
-#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 112 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1633 "CameraTable.c"
+#line 1158 "CameraTable.c"
 }
 
 
@@ -1655,7 +1178,7 @@ string_strnlen (gchar* str,
 		result = maxlen;
 #line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 1657 "CameraTable.c"
+#line 1182 "CameraTable.c"
 	} else {
 		gchar* _tmp2_;
 #line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
@@ -1664,7 +1187,7 @@ string_strnlen (gchar* str,
 		result = (glong) (_tmp2_ - str);
 #line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 1666 "CameraTable.c"
+#line 1191 "CameraTable.c"
 	}
 }
 
@@ -1685,17 +1208,17 @@ string_substring (const gchar* self,
 	if (offset >= ((glong) 0)) {
 #line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = len >= ((glong) 0);
-#line 1687 "CameraTable.c"
+#line 1212 "CameraTable.c"
 	} else {
 #line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 1691 "CameraTable.c"
+#line 1216 "CameraTable.c"
 	}
 #line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		string_length = string_strnlen ((gchar*) self, offset + len);
-#line 1697 "CameraTable.c"
+#line 1222 "CameraTable.c"
 	} else {
 		gint _tmp1_;
 		gint _tmp2_;
@@ -1705,11 +1228,11 @@ string_substring (const gchar* self,
 		_tmp2_ = _tmp1_;
 #line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp2_;
-#line 1707 "CameraTable.c"
+#line 1232 "CameraTable.c"
 	}
 #line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (offset < ((glong) 0)) {
-#line 1711 "CameraTable.c"
+#line 1236 "CameraTable.c"
 		glong _tmp3_;
 #line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
@@ -1717,24 +1240,24 @@ string_substring (const gchar* self,
 		offset = _tmp3_ + offset;
 #line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (offset >= ((glong) 0), NULL);
-#line 1719 "CameraTable.c"
+#line 1244 "CameraTable.c"
 	} else {
 		glong _tmp4_;
 #line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp4_ = string_length;
 #line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (offset <= _tmp4_, NULL);
-#line 1726 "CameraTable.c"
+#line 1251 "CameraTable.c"
 	}
 #line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (len < ((glong) 0)) {
-#line 1730 "CameraTable.c"
+#line 1255 "CameraTable.c"
 		glong _tmp5_;
 #line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp5_ = string_length;
 #line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		len = _tmp5_ - offset;
-#line 1736 "CameraTable.c"
+#line 1261 "CameraTable.c"
 	}
 #line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp6_ = string_length;
@@ -1746,7 +1269,7 @@ string_substring (const gchar* self,
 	result = _tmp7_;
 #line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 1748 "CameraTable.c"
+#line 1273 "CameraTable.c"
 }
 
 
@@ -1769,25 +1292,25 @@ string_replace (const gchar* self,
 	if ((*((gchar*) self)) == '\0') {
 #line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 1771 "CameraTable.c"
+#line 1296 "CameraTable.c"
 	} else {
 #line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp1_ = (*((gchar*) old)) == '\0';
-#line 1775 "CameraTable.c"
+#line 1300 "CameraTable.c"
 	}
 #line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 1781 "CameraTable.c"
+#line 1306 "CameraTable.c"
 	} else {
 #line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strcmp0 (old, replacement) == 0;
-#line 1785 "CameraTable.c"
+#line 1310 "CameraTable.c"
 	}
 #line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 1789 "CameraTable.c"
+#line 1314 "CameraTable.c"
 		gchar* _tmp2_;
 #line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp2_ = g_strdup (self);
@@ -1795,7 +1318,7 @@ string_replace (const gchar* self,
 		result = _tmp2_;
 #line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 1797 "CameraTable.c"
+#line 1322 "CameraTable.c"
 	}
 	{
 		GRegex* regex = NULL;
@@ -1823,7 +1346,7 @@ string_replace (const gchar* self,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1825 "CameraTable.c"
+#line 1350 "CameraTable.c"
 				goto __catch66_g_regex_error;
 			}
 #line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
@@ -1832,7 +1355,7 @@ string_replace (const gchar* self,
 			g_clear_error (&_inner_error_);
 #line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1834 "CameraTable.c"
+#line 1359 "CameraTable.c"
 		}
 #line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp8_ = regex;
@@ -1846,7 +1369,7 @@ string_replace (const gchar* self,
 			_g_regex_unref0 (regex);
 #line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1848 "CameraTable.c"
+#line 1373 "CameraTable.c"
 				goto __catch66_g_regex_error;
 			}
 #line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
@@ -1857,7 +1380,7 @@ string_replace (const gchar* self,
 			g_clear_error (&_inner_error_);
 #line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			return NULL;
-#line 1859 "CameraTable.c"
+#line 1384 "CameraTable.c"
 		}
 #line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp10_ = _tmp7_;
@@ -1871,7 +1394,7 @@ string_replace (const gchar* self,
 		_g_regex_unref0 (regex);
 #line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 1873 "CameraTable.c"
+#line 1398 "CameraTable.c"
 	}
 	goto __finally66;
 	__catch66_g_regex_error:
@@ -1885,7 +1408,7 @@ string_replace (const gchar* self,
 		g_assert_not_reached ();
 #line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 1887 "CameraTable.c"
+#line 1412 "CameraTable.c"
 	}
 	__finally66:
 #line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
@@ -1896,7 +1419,7 @@ string_replace (const gchar* self,
 		g_clear_error (&_inner_error_);
 #line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return NULL;
-#line 1898 "CameraTable.c"
+#line 1423 "CameraTable.c"
 	}
 }
 
@@ -1906,47 +1429,74 @@ camera_table_get_port_path (const gchar* port)
 {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 209 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 115 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (port != NULL, NULL);
-#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (g_str_has_prefix (port, "usb:")) {
-#line 1912 "CameraTable.c"
+#line 1437 "CameraTable.c"
 		gchar* _tmp1_;
 		gchar* _tmp2_;
 		gchar* _tmp3_;
 		gchar* _tmp4_;
 		gchar* _tmp5_;
-#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp1_ = string_substring (port, (glong) 4, (glong) -1);
-#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp2_ = _tmp1_;
-#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp3_ = string_replace (_tmp2_, ",", "/");
-#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp4_ = _tmp3_;
-#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp5_ = g_strdup_printf ("/dev/bus/usb/%s", _tmp4_);
-#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_free0 (_tmp0_);
-#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp0_ = _tmp5_;
-#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_free0 (_tmp4_);
-#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_free0 (_tmp2_);
-#line 1936 "CameraTable.c"
+#line 1461 "CameraTable.c"
 	} else {
-#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_free0 (_tmp0_);
-#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp0_ = NULL;
-#line 1942 "CameraTable.c"
+#line 1467 "CameraTable.c"
 	}
-#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = _tmp0_;
-#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 1948 "CameraTable.c"
+#line 1473 "CameraTable.c"
+}
+
+
+static gpointer
+_g_object_ref0 (gpointer self)
+{
+#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 1482 "CameraTable.c"
+}
+
+
+static void
+_g_object_unref0_ (gpointer var)
+{
+#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+	(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
+#line 1491 "CameraTable.c"
+}
+
+
+static inline void
+_g_list_free__g_object_unref0_ (GList* self)
+{
+#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+	g_list_free_full (self, (GDestroyNotify) _g_object_unref0_);
+#line 1500 "CameraTable.c"
 }
 
 
@@ -1957,78 +1507,78 @@ camera_table_get_name_for_uuid (CameraTable* self,
 	gchar* result = NULL;
 	GVolumeMonitor* _tmp0_;
 	GList* _tmp1_;
-#line 215 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
-#line 215 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 121 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (uuid != NULL, NULL);
-#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp0_ = self->priv->volume_monitor;
-#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp1_ = g_volume_monitor_get_volumes (_tmp0_);
-#line 1967 "CameraTable.c"
+#line 1519 "CameraTable.c"
 	{
 		GList* volume_collection = NULL;
 		GList* volume_it = NULL;
-#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		volume_collection = _tmp1_;
-#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) {
-#line 1975 "CameraTable.c"
+#line 1527 "CameraTable.c"
 			GVolume* _tmp2_;
 			GVolume* volume = NULL;
-#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
-#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			volume = _tmp2_;
-#line 1982 "CameraTable.c"
+#line 1534 "CameraTable.c"
 			{
 				GVolume* _tmp3_;
 				gchar* _tmp4_;
 				gchar* _tmp5_;
 				gboolean _tmp6_;
-#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 123 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp3_ = volume;
-#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 123 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp4_ = g_volume_get_identifier (_tmp3_, G_VOLUME_IDENTIFIER_KIND_UUID);
-#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 123 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp5_ = _tmp4_;
-#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 123 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp6_ = g_strcmp0 (_tmp5_, uuid) == 0;
-#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 123 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (_tmp5_);
-#line 217 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 123 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp6_) {
-#line 2000 "CameraTable.c"
+#line 1552 "CameraTable.c"
 					GVolume* _tmp7_;
 					gchar* _tmp8_;
-#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp7_ = volume;
-#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp8_ = g_volume_get_name (_tmp7_);
-#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					result = _tmp8_;
-#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (volume);
-#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					__g_list_free__g_object_unref0_0 (volume_collection);
-#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 124 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return result;
-#line 2015 "CameraTable.c"
+#line 1567 "CameraTable.c"
 				}
-#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_object_unref0 (volume);
-#line 2019 "CameraTable.c"
+#line 1571 "CameraTable.c"
 			}
 		}
-#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 122 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2024 "CameraTable.c"
+#line 1576 "CameraTable.c"
 	}
-#line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = NULL;
-#line 221 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 2030 "CameraTable.c"
+#line 1582 "CameraTable.c"
 }
 
 
@@ -2039,120 +1589,120 @@ camera_table_get_icon_for_uuid (CameraTable* self,
 	gchar* result = NULL;
 	GVolumeMonitor* _tmp0_;
 	GList* _tmp1_;
-#line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 130 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (IS_CAMERA_TABLE (self), NULL);
-#line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 130 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_val_if_fail (uuid != NULL, NULL);
-#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp0_ = self->priv->volume_monitor;
-#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp1_ = g_volume_monitor_get_volumes (_tmp0_);
-#line 2049 "CameraTable.c"
+#line 1601 "CameraTable.c"
 	{
 		GList* volume_collection = NULL;
 		GList* volume_it = NULL;
-#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		volume_collection = _tmp1_;
-#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		for (volume_it = volume_collection; volume_it != NULL; volume_it = volume_it->next) {
-#line 2057 "CameraTable.c"
+#line 1609 "CameraTable.c"
 			GVolume* _tmp2_;
 			GVolume* volume = NULL;
-#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp2_ = _g_object_ref0 ((GVolume*) volume_it->data);
-#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			volume = _tmp2_;
-#line 2064 "CameraTable.c"
+#line 1616 "CameraTable.c"
 			{
 				GVolume* _tmp3_;
 				gchar* _tmp4_;
 				gchar* _tmp5_;
 				gboolean _tmp6_;
-#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 132 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp3_ = volume;
-#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 132 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp4_ = g_volume_get_identifier (_tmp3_, G_VOLUME_IDENTIFIER_KIND_UUID);
-#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 132 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp5_ = _tmp4_;
-#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 132 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp6_ = g_strcmp0 (_tmp5_, uuid) == 0;
-#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 132 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (_tmp5_);
-#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 132 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_tmp6_) {
-#line 2082 "CameraTable.c"
+#line 1634 "CameraTable.c"
 					GVolume* _tmp7_;
 					GIcon* _tmp8_;
 					GIcon* _tmp9_;
 					gchar* _tmp10_;
 					gchar* _tmp11_;
-#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp7_ = volume;
-#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp8_ = g_volume_get_icon (_tmp7_);
-#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp9_ = _tmp8_;
-#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp10_ = g_icon_to_string (_tmp9_);
-#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp11_ = _tmp10_;
-#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_tmp9_);
-#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					result = _tmp11_;
-#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (volume);
-#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					__g_list_free__g_object_unref0_0 (volume_collection);
-#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 133 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return result;
-#line 2108 "CameraTable.c"
+#line 1660 "CameraTable.c"
 				}
-#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_object_unref0 (volume);
-#line 2112 "CameraTable.c"
+#line 1664 "CameraTable.c"
 			}
 		}
-#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 131 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		__g_list_free__g_object_unref0_0 (volume_collection);
-#line 2117 "CameraTable.c"
+#line 1669 "CameraTable.c"
 	}
-#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 136 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	result = NULL;
-#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 136 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return result;
-#line 2123 "CameraTable.c"
+#line 1675 "CameraTable.c"
 }
 
 
 static gpointer
 _discovered_camera_ref0 (gpointer self)
 {
-#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return self ? discovered_camera_ref (self) : NULL;
-#line 2132 "CameraTable.c"
+#line 1684 "CameraTable.c"
 }
 
 
 static void
-_vala_array_add70 (DiscoveredCamera** * array,
+_vala_array_add69 (DiscoveredCamera** * array,
                    int* length,
                    int* size,
                    DiscoveredCamera* value)
 {
-#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if ((*length) == (*size)) {
-#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*array = g_renew (DiscoveredCamera*, *array, (*size) + 1);
-#line 2148 "CameraTable.c"
+#line 1700 "CameraTable.c"
 	}
-#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	(*array)[(*length)++] = value;
-#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	(*array)[*length] = NULL;
-#line 2154 "CameraTable.c"
+#line 1706 "CameraTable.c"
 }
 
 
@@ -2173,2149 +1723,2025 @@ camera_table_update_camera_table (CameraTable* self,
 	GPContext* _tmp8_;
 	GeeHashMap* detected_map = NULL;
 	GeeHashMap* _tmp9_;
-	gchar** usb_cameras = NULL;
-	gint _tmp10_;
-	gchar** _tmp11_;
-	gint usb_cameras_length1;
-	gint _usb_cameras_size_;
 	DiscoveredCamera** missing = NULL;
-	DiscoveredCamera** _tmp41_;
+	DiscoveredCamera** _tmp31_;
 	gint missing_length1;
 	gint _missing_size_;
-	DiscoveredCamera** _tmp72_;
-	gint _tmp72__length1;
+	DiscoveredCamera** _tmp62_;
+	gint _tmp62__length1;
 	GError * _inner_error_ = NULL;
-#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp1_ = gp_port_info_list_new (&_tmp0_);
-#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_gp_port_info_list_free0 (port_info_list);
-#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	port_info_list = _tmp0_;
-#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_do_op (self, _tmp1_, "create port list", &_inner_error_);
-#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
-#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2207 "CameraTable.c"
+#line 1754 "CameraTable.c"
 		} else {
-#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
-#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_clear_error (&_inner_error_);
-#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 142 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2217 "CameraTable.c"
+#line 1764 "CameraTable.c"
 		}
 	}
-#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp2_ = port_info_list;
-#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_do_op (self, gp_port_info_list_load (_tmp2_), "load port list", &_inner_error_);
-#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
-#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2234 "CameraTable.c"
+#line 1781 "CameraTable.c"
 		} else {
-#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
-#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_clear_error (&_inner_error_);
-#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2244 "CameraTable.c"
+#line 1791 "CameraTable.c"
 		}
 	}
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp4_ = gp_list_new (&_tmp3_);
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_gp_list_unref0 (camera_list);
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_list = _tmp3_;
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_do_op (self, _tmp4_, "create camera list", &_inner_error_);
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_list_unref0 (camera_list);
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2267 "CameraTable.c"
+#line 1814 "CameraTable.c"
 		} else {
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_list_unref0 (camera_list);
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_clear_error (&_inner_error_);
-#line 240 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2279 "CameraTable.c"
+#line 1826 "CameraTable.c"
 		}
 	}
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp5_ = self->priv->abilities_list;
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp6_ = port_info_list;
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp7_ = camera_list;
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp8_ = self->priv->null_context;
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_do_op (self, gp_abilities_list_detect (_tmp5_, _tmp6_, _tmp7_, _tmp8_), "detect cameras", &_inner_error_);
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_list_unref0 (camera_list);
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2304 "CameraTable.c"
+#line 1851 "CameraTable.c"
 		} else {
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_list_unref0 (camera_list);
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_port_info_list_free0 (port_info_list);
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_clear_error (&_inner_error_);
-#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 147 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 2316 "CameraTable.c"
+#line 1863 "CameraTable.c"
 		}
 	}
-#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 149 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp9_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 149 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	detected_map = _tmp9_;
-#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp11_ = camera_table_get_all_usb_cameras (self, &_tmp10_);
-#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	usb_cameras = _tmp11_;
-#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	usb_cameras_length1 = _tmp10_;
-#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_usb_cameras_size_ = usb_cameras_length1;
-#line 2331 "CameraTable.c"
+#line 1870 "CameraTable.c"
 	{
 		gint ctr = 0;
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		ctr = 0;
-#line 2336 "CameraTable.c"
+#line 1875 "CameraTable.c"
 		{
-			gboolean _tmp12_ = FALSE;
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp12_ = TRUE;
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			gboolean _tmp10_ = FALSE;
+#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp10_ = TRUE;
+#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			while (TRUE) {
-#line 2343 "CameraTable.c"
-				gint _tmp14_;
-				CameraList* _tmp15_;
+#line 1882 "CameraTable.c"
+				gint _tmp12_;
+				CameraList* _tmp13_;
 				gchar* name = NULL;
-				CameraList* _tmp16_;
-				gint _tmp17_;
-				const gchar* _tmp18_ = NULL;
-				int _tmp19_;
-				gchar* _tmp20_;
+				CameraList* _tmp14_;
+				gint _tmp15_;
+				const gchar* _tmp16_ = NULL;
+				int _tmp17_;
+				gchar* _tmp18_;
 				gchar* port = NULL;
-				CameraList* _tmp21_;
-				gint _tmp22_;
-				const gchar* _tmp23_ = NULL;
-				int _tmp24_;
-				gchar* _tmp25_;
-				gint _tmp26_;
-				CameraList* _tmp27_;
-				const gchar* _tmp28_;
+				CameraList* _tmp19_;
+				gint _tmp20_;
+				const gchar* _tmp21_ = NULL;
+				int _tmp22_;
+				gchar* _tmp23_;
+				gint _tmp24_;
+				CameraList* _tmp25_;
+				const gchar* _tmp26_;
+				const gchar* _tmp27_;
+				GeeHashMap* _tmp28_;
 				const gchar* _tmp29_;
 				const gchar* _tmp30_;
-				GeeHashMap* _tmp38_;
-				const gchar* _tmp39_;
-				const gchar* _tmp40_;
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				if (!_tmp12_) {
-#line 2368 "CameraTable.c"
-					gint _tmp13_;
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp13_ = ctr;
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					ctr = _tmp13_ + 1;
-#line 2374 "CameraTable.c"
+#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				if (!_tmp10_) {
+#line 1906 "CameraTable.c"
+					gint _tmp11_;
+#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp11_ = ctr;
+#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					ctr = _tmp11_ + 1;
+#line 1912 "CameraTable.c"
 				}
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp12_ = FALSE;
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp14_ = ctr;
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp15_ = camera_list;
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				if (!(_tmp14_ < gp_list_count (_tmp15_))) {
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp10_ = FALSE;
+#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp12_ = ctr;
+#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp13_ = camera_list;
+#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				if (!(_tmp12_ < gp_list_count (_tmp13_))) {
+#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					break;
-#line 2386 "CameraTable.c"
+#line 1924 "CameraTable.c"
 				}
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp16_ = camera_list;
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp17_ = ctr;
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp19_ = gp_list_get_name (_tmp16_, _tmp17_, &_tmp18_);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp14_ = camera_list;
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp15_ = ctr;
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp17_ = gp_list_get_name (_tmp14_, _tmp15_, &_tmp16_);
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (name);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp20_ = g_strdup (_tmp18_);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				name = _tmp20_;
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				camera_table_do_op (self, _tmp19_, "get detected camera name", &_inner_error_);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp18_ = g_strdup (_tmp16_);
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				name = _tmp18_;
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				camera_table_do_op (self, _tmp17_, "get detected camera name", &_inner_error_);
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_propagate_error (error, _inner_error_);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2420 "CameraTable.c"
+#line 1956 "CameraTable.c"
 					} else {
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_clear_error (&_inner_error_);
-#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 154 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2438 "CameraTable.c"
+#line 1972 "CameraTable.c"
 					}
 				}
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp21_ = camera_list;
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp22_ = ctr;
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp24_ = gp_list_get_value (_tmp21_, _tmp22_, &_tmp23_);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp19_ = camera_list;
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp20_ = ctr;
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp22_ = gp_list_get_value (_tmp19_, _tmp20_, &_tmp21_);
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (port);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp25_ = g_strdup (_tmp23_);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				port = _tmp25_;
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				camera_table_do_op (self, _tmp24_, "get detected camera port", &_inner_error_);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp23_ = g_strdup (_tmp21_);
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				port = _tmp23_;
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				camera_table_do_op (self, _tmp22_, "get detected camera port", &_inner_error_);
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_propagate_error (error, _inner_error_);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2475 "CameraTable.c"
+#line 2007 "CameraTable.c"
 					} else {
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_clear_error (&_inner_error_);
-#line 254 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 157 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2495 "CameraTable.c"
+#line 2025 "CameraTable.c"
 					}
 				}
-#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp26_ = ctr;
-#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp27_ = camera_list;
-#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp28_ = name;
-#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 159 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp24_ = ctr;
+#line 159 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp25_ = camera_list;
+#line 159 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp26_ = name;
+#line 159 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp27_ = port;
+#line 159 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				g_debug ("CameraTable.vala:159: Detected %d/%d %s @ %s", _tmp24_ + 1, gp_list_count (_tmp25_), _tmp26_, _tmp27_);
+#line 162 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp28_ = detected_map;
+#line 162 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_tmp29_ = port;
-#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				g_debug ("CameraTable.vala:256: Detected %d/%d %s @ %s", _tmp26_ + 1, gp_list_count (_tmp27_), _tmp28_, _tmp29_);
-#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp30_ = port;
-#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				if (g_str_has_prefix (_tmp30_, "usb:")) {
-#line 2512 "CameraTable.c"
-					gchar* full_port = NULL;
-					CameraList* _tmp31_;
-					gchar** _tmp32_;
-					gint _tmp32__length1;
-					const gchar* _tmp33_;
-					gchar* _tmp34_ = NULL;
-					gboolean _tmp35_;
-					const gchar* _tmp36_;
-					gchar* _tmp37_;
-#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp31_ = camera_list;
-#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp32_ = usb_cameras;
-#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp32__length1 = usb_cameras_length1;
-#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp33_ = port;
-#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp35_ = camera_table_usb_esp (self, gp_list_count (_tmp31_), _tmp32_, _tmp32__length1, _tmp33_, &_tmp34_);
-#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_g_free0 (full_port);
-#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					full_port = _tmp34_;
-#line 261 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					if (!_tmp35_) {
-#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						_g_free0 (full_port);
-#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						_g_free0 (port);
-#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						_g_free0 (name);
-#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						continue;
-#line 2546 "CameraTable.c"
-					}
-#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp36_ = full_port;
-#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp37_ = g_strdup (_tmp36_);
-#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_g_free0 (port);
-#line 264 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					port = _tmp37_;
-#line 259 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_g_free0 (full_port);
-#line 2558 "CameraTable.c"
-				}
-#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp38_ = detected_map;
-#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp39_ = port;
-#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp40_ = name;
-#line 267 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp39_, _tmp40_);
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp30_ = name;
+#line 162 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp29_, _tmp30_);
+#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (port);
-#line 249 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 152 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (name);
-#line 2572 "CameraTable.c"
+#line 2050 "CameraTable.c"
 			}
 		}
 	}
-#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp41_ = g_new0 (DiscoveredCamera*, 0 + 1);
-#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	missing = _tmp41_;
-#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 166 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+	_tmp31_ = g_new0 (DiscoveredCamera*, 0 + 1);
+#line 166 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+	missing = _tmp31_;
+#line 166 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	missing_length1 = 0;
-#line 271 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 166 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_missing_size_ = missing_length1;
-#line 2584 "CameraTable.c"
+#line 2062 "CameraTable.c"
 	{
 		GeeIterator* _camera_it = NULL;
-		GeeHashMap* _tmp42_;
-		GeeCollection* _tmp43_;
-		GeeCollection* _tmp44_;
-		GeeCollection* _tmp45_;
-		GeeIterator* _tmp46_;
-		GeeIterator* _tmp47_;
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp42_ = self->priv->camera_map;
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp43_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp44_ = _tmp43_;
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp45_ = _tmp44_;
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp46_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp47_ = _tmp46_;
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_g_object_unref0 (_tmp45_);
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_camera_it = _tmp47_;
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		GeeHashMap* _tmp32_;
+		GeeCollection* _tmp33_;
+		GeeCollection* _tmp34_;
+		GeeCollection* _tmp35_;
+		GeeIterator* _tmp36_;
+		GeeIterator* _tmp37_;
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_tmp32_ = self->priv->camera_map;
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_tmp33_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_tmp34_ = _tmp33_;
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_tmp35_ = _tmp34_;
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_tmp36_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ITERABLE, GeeIterable));
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_tmp37_ = _tmp36_;
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_g_object_unref0 (_tmp35_);
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_camera_it = _tmp37_;
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		while (TRUE) {
-#line 2611 "CameraTable.c"
-			GeeIterator* _tmp48_;
+#line 2089 "CameraTable.c"
+			GeeIterator* _tmp38_;
 			DiscoveredCamera* camera = NULL;
-			GeeIterator* _tmp49_;
-			gpointer _tmp50_;
+			GeeIterator* _tmp39_;
+			gpointer _tmp40_;
 			GPPortInfo port_info = {0};
 			gchar* tmp_path = NULL;
-			DiscoveredCamera* _tmp51_;
-			Camera* _tmp52_;
-			GPPortInfo _tmp53_ = {0};
-			int _tmp54_;
-			const gchar* _tmp55_ = NULL;
-			gchar* _tmp56_;
+			DiscoveredCamera* _tmp41_;
+			Camera* _tmp42_;
+			GPPortInfo _tmp43_ = {0};
+			int _tmp44_;
+			const gchar* _tmp45_ = NULL;
+			gchar* _tmp46_;
 			CameraAbilities abilities = {0};
-			DiscoveredCamera* _tmp57_;
-			Camera* _tmp58_;
-			CameraAbilities _tmp59_ = {0};
-			int _tmp60_;
-			GeeHashMap* _tmp61_;
-			const gchar* _tmp62_;
-			CameraAbilities _tmp66_;
-			const gchar* _tmp67_;
-			const gchar* _tmp68_;
-			DiscoveredCamera** _tmp69_;
-			gint _tmp69__length1;
-			DiscoveredCamera* _tmp70_;
-			DiscoveredCamera* _tmp71_;
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp48_ = _camera_it;
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			if (!gee_iterator_next (_tmp48_)) {
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			DiscoveredCamera* _tmp47_;
+			Camera* _tmp48_;
+			CameraAbilities _tmp49_ = {0};
+			int _tmp50_;
+			GeeHashMap* _tmp51_;
+			const gchar* _tmp52_;
+			CameraAbilities _tmp56_;
+			const gchar* _tmp57_;
+			const gchar* _tmp58_;
+			DiscoveredCamera** _tmp59_;
+			gint _tmp59__length1;
+			DiscoveredCamera* _tmp60_;
+			DiscoveredCamera* _tmp61_;
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp38_ = _camera_it;
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			if (!gee_iterator_next (_tmp38_)) {
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				break;
-#line 2644 "CameraTable.c"
+#line 2122 "CameraTable.c"
 			}
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp49_ = _camera_it;
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp50_ = gee_iterator_get (_tmp49_);
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera = (DiscoveredCamera*) _tmp50_;
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp51_ = camera;
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp52_ = _tmp51_->gcamera;
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp54_ = gp_camera_get_port_info (_tmp52_, &_tmp53_);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp39_ = _camera_it;
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp40_ = gee_iterator_get (_tmp39_);
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera = (DiscoveredCamera*) _tmp40_;
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp41_ = camera;
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp42_ = _tmp41_->gcamera;
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp44_ = gp_camera_get_port_info (_tmp42_, &_tmp43_);
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			 (port_info);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			port_info = _tmp53_;
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_table_do_op (self, _tmp54_, "retrieve missing camera port information", &_inner_error_);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			port_info = _tmp43_;
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_table_do_op (self, _tmp44_, "retrieve missing camera port information", &_inner_error_);
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_discovered_camera_unref0 (camera);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_camera_it);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 2690 "CameraTable.c"
+#line 2166 "CameraTable.c"
 				} else {
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_discovered_camera_unref0 (camera);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_camera_it);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_clear_error (&_inner_error_);
-#line 276 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 171 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 2716 "CameraTable.c"
+#line 2190 "CameraTable.c"
 				}
 			}
-#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			gp_port_info_get_path (port_info, &_tmp55_);
-#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			gp_port_info_get_path (port_info, &_tmp45_);
+#line 174 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (tmp_path);
-#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp56_ = g_strdup (_tmp55_);
-#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			tmp_path = _tmp56_;
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp57_ = camera;
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp58_ = _tmp57_->gcamera;
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp60_ = gp_camera_get_abilities (_tmp58_, &_tmp59_);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp46_ = g_strdup (_tmp45_);
+#line 174 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			tmp_path = _tmp46_;
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp47_ = camera;
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp48_ = _tmp47_->gcamera;
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp50_ = gp_camera_get_abilities (_tmp48_, &_tmp49_);
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			 (abilities);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			abilities = _tmp59_;
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_table_do_op (self, _tmp60_, "retrieve camera abilities", &_inner_error_);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			abilities = _tmp49_;
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_table_do_op (self, _tmp50_, "retrieve camera abilities", &_inner_error_);
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (abilities);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_discovered_camera_unref0 (camera);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_camera_it);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 2767 "CameraTable.c"
+#line 2239 "CameraTable.c"
 				} else {
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (abilities);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_discovered_camera_unref0 (camera);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_camera_it);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_clear_error (&_inner_error_);
-#line 282 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 2795 "CameraTable.c"
+#line 2265 "CameraTable.c"
 				}
 			}
-#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp61_ = detected_map;
-#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp62_ = tmp_path;
-#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp62_)) {
-#line 2804 "CameraTable.c"
-				CameraAbilities _tmp63_;
-				const gchar* _tmp64_;
-				const gchar* _tmp65_;
-#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp63_ = abilities;
-#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp64_ = _tmp63_.model;
-#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp65_ = tmp_path;
-#line 285 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				g_debug ("CameraTable.vala:285: Found camera for %s @ %s in detected map", _tmp64_, _tmp65_);
-#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 179 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp51_ = detected_map;
+#line 179 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp52_ = tmp_path;
+#line 179 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp52_)) {
+#line 2274 "CameraTable.c"
+				CameraAbilities _tmp53_;
+				const gchar* _tmp54_;
+				const gchar* _tmp55_;
+#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp53_ = abilities;
+#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp54_ = _tmp53_.model;
+#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp55_ = tmp_path;
+#line 180 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				g_debug ("CameraTable.vala:180: Found camera for %s @ %s in detected map", _tmp54_, _tmp55_);
+#line 182 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				 (abilities);
-#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (tmp_path);
-#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				 (port_info);
-#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_discovered_camera_unref0 (camera);
-#line 287 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				continue;
-#line 2826 "CameraTable.c"
+#line 2296 "CameraTable.c"
 			}
-#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp66_ = abilities;
-#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp67_ = _tmp66_.model;
-#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp68_ = tmp_path;
-#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			g_debug ("CameraTable.vala:290: %s @ %s missing", _tmp67_, _tmp68_);
-#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp69_ = missing;
-#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp69__length1 = missing_length1;
-#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp70_ = camera;
-#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp71_ = _discovered_camera_ref0 (_tmp70_);
-#line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_vala_array_add70 (&missing, &missing_length1, &_missing_size_, _tmp71_);
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp56_ = abilities;
+#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp57_ = _tmp56_.model;
+#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp58_ = tmp_path;
+#line 185 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			g_debug ("CameraTable.vala:185: %s @ %s missing", _tmp57_, _tmp58_);
+#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp59_ = missing;
+#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp59__length1 = missing_length1;
+#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp60_ = camera;
+#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp61_ = _discovered_camera_ref0 (_tmp60_);
+#line 187 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_vala_array_add69 (&missing, &missing_length1, &_missing_size_, _tmp61_);
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			 (abilities);
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (tmp_path);
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			 (port_info);
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_discovered_camera_unref0 (camera);
-#line 2854 "CameraTable.c"
+#line 2324 "CameraTable.c"
 		}
-#line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 167 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_object_unref0 (_camera_it);
-#line 2858 "CameraTable.c"
+#line 2328 "CameraTable.c"
 	}
-#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp72_ = missing;
-#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	_tmp72__length1 = missing_length1;
-#line 2864 "CameraTable.c"
+#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+	_tmp62_ = missing;
+#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+	_tmp62__length1 = missing_length1;
+#line 2334 "CameraTable.c"
 	{
 		DiscoveredCamera** camera_collection = NULL;
 		gint camera_collection_length1 = 0;
 		gint _camera_collection_size_ = 0;
 		gint camera_it = 0;
-#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		camera_collection = _tmp72_;
-#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		camera_collection_length1 = _tmp72__length1;
-#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		for (camera_it = 0; camera_it < _tmp72__length1; camera_it = camera_it + 1) {
-#line 2876 "CameraTable.c"
-			DiscoveredCamera* _tmp73_;
+#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		camera_collection = _tmp62_;
+#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		camera_collection_length1 = _tmp62__length1;
+#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		for (camera_it = 0; camera_it < _tmp62__length1; camera_it = camera_it + 1) {
+#line 2346 "CameraTable.c"
+			DiscoveredCamera* _tmp63_;
 			DiscoveredCamera* camera = NULL;
-#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp73_ = _discovered_camera_ref0 (camera_collection[camera_it]);
-#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera = _tmp73_;
-#line 2883 "CameraTable.c"
+#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp63_ = _discovered_camera_ref0 (camera_collection[camera_it]);
+#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera = _tmp63_;
+#line 2353 "CameraTable.c"
 			{
 				GPPortInfo port_info = {0};
 				gchar* tmp_path = NULL;
-				DiscoveredCamera* _tmp74_;
-				Camera* _tmp75_;
-				GPPortInfo _tmp76_ = {0};
-				int _tmp77_;
-				const gchar* _tmp78_ = NULL;
-				gchar* _tmp79_;
+				DiscoveredCamera* _tmp64_;
+				Camera* _tmp65_;
+				GPPortInfo _tmp66_ = {0};
+				int _tmp67_;
+				const gchar* _tmp68_ = NULL;
+				gchar* _tmp69_;
 				CameraAbilities abilities = {0};
-				DiscoveredCamera* _tmp80_;
-				Camera* _tmp81_;
-				CameraAbilities _tmp82_ = {0};
-				int _tmp83_;
-				CameraAbilities _tmp84_;
-				const gchar* _tmp85_;
-				const gchar* _tmp86_;
-				GeeHashMap* _tmp87_;
-				const gchar* _tmp88_;
-				gchar* _tmp89_;
-				gchar* _tmp90_;
-				DiscoveredCamera* _tmp91_;
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp74_ = camera;
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp75_ = _tmp74_->gcamera;
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp77_ = gp_camera_get_port_info (_tmp75_, &_tmp76_);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				DiscoveredCamera* _tmp70_;
+				Camera* _tmp71_;
+				CameraAbilities _tmp72_ = {0};
+				int _tmp73_;
+				CameraAbilities _tmp74_;
+				const gchar* _tmp75_;
+				const gchar* _tmp76_;
+				GeeHashMap* _tmp77_;
+				const gchar* _tmp78_;
+				gchar* _tmp79_;
+				gchar* _tmp80_;
+				DiscoveredCamera* _tmp81_;
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp64_ = camera;
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp65_ = _tmp64_->gcamera;
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp67_ = gp_camera_get_port_info (_tmp65_, &_tmp66_);
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				 (port_info);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				port_info = _tmp76_;
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				camera_table_do_op (self, _tmp77_, "retrieve missing camera port information", &_inner_error_);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				port_info = _tmp66_;
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				camera_table_do_op (self, _tmp67_, "retrieve missing camera port information", &_inner_error_);
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_propagate_error (error, _inner_error_);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (tmp_path);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						 (port_info);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_discovered_camera_unref0 (camera);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2942 "CameraTable.c"
+#line 2410 "CameraTable.c"
 					} else {
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (tmp_path);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						 (port_info);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_discovered_camera_unref0 (camera);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_clear_error (&_inner_error_);
-#line 300 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 195 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 2966 "CameraTable.c"
+#line 2432 "CameraTable.c"
 					}
 				}
-#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				gp_port_info_get_path (port_info, &_tmp78_);
-#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				gp_port_info_get_path (port_info, &_tmp68_);
+#line 197 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (tmp_path);
-#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp79_ = g_strdup (_tmp78_);
-#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				tmp_path = _tmp79_;
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp80_ = camera;
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp81_ = _tmp80_->gcamera;
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp83_ = gp_camera_get_abilities (_tmp81_, &_tmp82_);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp69_ = g_strdup (_tmp68_);
+#line 197 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				tmp_path = _tmp69_;
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp70_ = camera;
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp71_ = _tmp70_->gcamera;
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp73_ = gp_camera_get_abilities (_tmp71_, &_tmp72_);
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				 (abilities);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				abilities = _tmp82_;
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				camera_table_do_op (self, _tmp83_, "retrieve missing camera abilities", &_inner_error_);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				abilities = _tmp72_;
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				camera_table_do_op (self, _tmp73_, "retrieve missing camera abilities", &_inner_error_);
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_propagate_error (error, _inner_error_);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						 (abilities);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (tmp_path);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						 (port_info);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_discovered_camera_unref0 (camera);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3015 "CameraTable.c"
+#line 2479 "CameraTable.c"
 					} else {
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						 (abilities);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (tmp_path);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						 (port_info);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_discovered_camera_unref0 (camera);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_clear_error (&_inner_error_);
-#line 305 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3041 "CameraTable.c"
+#line 2503 "CameraTable.c"
 					}
 				}
-#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp84_ = abilities;
-#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp85_ = _tmp84_.model;
-#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp86_ = tmp_path;
-#line 307 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				g_debug ("CameraTable.vala:307: Removing from camera table: %s @ %s", _tmp85_, _tmp86_);
-#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp87_ = self->priv->camera_map;
-#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp88_ = tmp_path;
-#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp89_ = camera_table_get_port_uri (_tmp88_);
-#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp90_ = _tmp89_;
-#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp90_, NULL);
-#line 309 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_g_free0 (_tmp90_);
-#line 311 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp91_ = camera;
-#line 311 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL], 0, _tmp91_);
-#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp74_ = abilities;
+#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp75_ = _tmp74_.model;
+#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp76_ = tmp_path;
+#line 202 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				g_debug ("CameraTable.vala:202: Removing from camera table: %s @ %s", _tmp75_, _tmp76_);
+#line 204 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp77_ = self->priv->camera_map;
+#line 204 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp78_ = tmp_path;
+#line 204 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp79_ = camera_table_get_port_uri (_tmp78_);
+#line 204 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp80_ = _tmp79_;
+#line 204 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp80_, NULL);
+#line 204 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_g_free0 (_tmp80_);
+#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp81_ = camera;
+#line 206 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL], 0, _tmp81_);
+#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				 (abilities);
-#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (tmp_path);
-#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				 (port_info);
-#line 296 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 191 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_discovered_camera_unref0 (camera);
-#line 3076 "CameraTable.c"
+#line 2538 "CameraTable.c"
 			}
 		}
 	}
 	{
 		GeeIterator* _port_it = NULL;
-		GeeHashMap* _tmp92_;
-		GeeSet* _tmp93_;
-		GeeSet* _tmp94_;
-		GeeSet* _tmp95_;
-		GeeIterator* _tmp96_;
-		GeeIterator* _tmp97_;
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp92_ = detected_map;
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp93_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp94_ = _tmp93_;
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp95_ = _tmp94_;
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp96_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_tmp97_ = _tmp96_;
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_g_object_unref0 (_tmp95_);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		_port_it = _tmp97_;
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		GeeHashMap* _tmp82_;
+		GeeSet* _tmp83_;
+		GeeSet* _tmp84_;
+		GeeSet* _tmp85_;
+		GeeIterator* _tmp86_;
+		GeeIterator* _tmp87_;
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_tmp82_ = detected_map;
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_tmp83_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_tmp84_ = _tmp83_;
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_tmp85_ = _tmp84_;
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_tmp86_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_ITERABLE, GeeIterable));
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_tmp87_ = _tmp86_;
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_g_object_unref0 (_tmp85_);
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		_port_it = _tmp87_;
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		while (TRUE) {
-#line 3106 "CameraTable.c"
-			GeeIterator* _tmp98_;
+#line 2568 "CameraTable.c"
+			GeeIterator* _tmp88_;
 			gchar* port = NULL;
-			GeeIterator* _tmp99_;
-			gpointer _tmp100_;
+			GeeIterator* _tmp89_;
+			gpointer _tmp90_;
 			gchar* name = NULL;
-			GeeHashMap* _tmp101_;
-			const gchar* _tmp102_;
-			gpointer _tmp103_;
+			GeeHashMap* _tmp91_;
+			const gchar* _tmp92_;
+			gpointer _tmp93_;
 			gchar* display_name = NULL;
 			gchar* icon = NULL;
 			gchar* uri = NULL;
-			const gchar* _tmp104_;
-			gchar* _tmp105_;
-			GeeHashMap* _tmp106_;
-			const gchar* _tmp107_;
+			const gchar* _tmp94_;
+			gchar* _tmp95_;
+			GeeHashMap* _tmp96_;
+			const gchar* _tmp97_;
 			gchar* path = NULL;
-			const gchar* _tmp110_;
-			gchar* _tmp111_;
-			const gchar* _tmp112_;
-			const gchar* _tmp132_;
-			const gchar* _tmp151_;
+			const gchar* _tmp100_;
+			gchar* _tmp101_;
+			const gchar* _tmp102_;
+			const gchar* _tmp122_;
+			const gchar* _tmp141_;
 			gint index = 0;
-			GPPortInfoList* _tmp154_;
-			const gchar* _tmp155_;
-			gint _tmp156_;
+			GPPortInfoList* _tmp144_;
+			const gchar* _tmp145_;
+			gint _tmp146_;
 			GPPortInfo port_info = {0};
 			gchar* tmp_path = NULL;
-			GPPortInfoList* _tmp161_;
-			gint _tmp162_;
-			GPPortInfo _tmp163_ = {0};
-			int _tmp164_;
-			const gchar* _tmp165_;
-			gchar* _tmp166_;
-			gchar* _tmp167_;
-			const gchar* _tmp168_ = NULL;
-			gchar* _tmp169_;
-			const gchar* _tmp170_;
-			const gchar* _tmp171_;
-			CameraAbilitiesList* _tmp172_;
-			const gchar* _tmp173_;
-			gint _tmp174_;
+			GPPortInfoList* _tmp151_;
+			gint _tmp152_;
+			GPPortInfo _tmp153_ = {0};
+			int _tmp154_;
+			const gchar* _tmp155_;
+			gchar* _tmp156_;
+			gchar* _tmp157_;
+			const gchar* _tmp158_ = NULL;
+			gchar* _tmp159_;
+			const gchar* _tmp160_;
+			const gchar* _tmp161_;
+			CameraAbilitiesList* _tmp162_;
+			const gchar* _tmp163_;
+			gint _tmp164_;
 			CameraAbilities camera_abilities = {0};
-			CameraAbilitiesList* _tmp179_;
-			gint _tmp180_;
-			CameraAbilities _tmp181_ = {0};
-			int _tmp182_;
+			CameraAbilitiesList* _tmp169_;
+			gint _tmp170_;
+			CameraAbilities _tmp171_ = {0};
+			int _tmp172_;
+			const gchar* _tmp173_;
+			gchar* _tmp174_;
+			gchar* _tmp175_;
+			Camera* gcamera = NULL;
+			Camera* _tmp176_ = NULL;
+			int _tmp177_;
+			const gchar* _tmp178_;
+			gchar* _tmp179_;
+			gchar* _tmp180_;
+			Camera* _tmp181_;
+			CameraAbilities _tmp182_;
 			const gchar* _tmp183_;
 			gchar* _tmp184_;
 			gchar* _tmp185_;
-			Camera* gcamera = NULL;
-			Camera* _tmp186_ = NULL;
-			int _tmp187_;
+			Camera* _tmp186_;
+			GPPortInfo _tmp187_;
 			const gchar* _tmp188_;
-			gchar* _tmp189_;
+			const gchar* _tmp189_;
 			gchar* _tmp190_;
-			Camera* _tmp191_;
-			CameraAbilities _tmp192_;
+			gchar* _tmp191_;
+			const gchar* _tmp192_;
 			const gchar* _tmp193_;
-			gchar* _tmp194_;
-			gchar* _tmp195_;
-			Camera* _tmp196_;
-			GPPortInfo _tmp197_;
-			const gchar* _tmp198_;
-			const gchar* _tmp199_;
-			gchar* _tmp200_;
-			gchar* _tmp201_;
-			const gchar* _tmp202_;
-			const gchar* _tmp203_;
 			DiscoveredCamera* camera = NULL;
-			Camera* _tmp204_;
-			const gchar* _tmp205_;
-			const gchar* _tmp206_;
-			const gchar* _tmp207_;
-			DiscoveredCamera* _tmp208_;
-			GeeHashMap* _tmp209_;
-			const gchar* _tmp210_;
-			DiscoveredCamera* _tmp211_;
-			DiscoveredCamera* _tmp212_;
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp98_ = _port_it;
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			if (!gee_iterator_next (_tmp98_)) {
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			Camera* _tmp194_;
+			const gchar* _tmp195_;
+			const gchar* _tmp196_;
+			const gchar* _tmp197_;
+			DiscoveredCamera* _tmp198_;
+			GeeHashMap* _tmp199_;
+			const gchar* _tmp200_;
+			DiscoveredCamera* _tmp201_;
+			DiscoveredCamera* _tmp202_;
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp88_ = _port_it;
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			if (!gee_iterator_next (_tmp88_)) {
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				break;
-#line 3191 "CameraTable.c"
+#line 2653 "CameraTable.c"
 			}
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp99_ = _port_it;
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp100_ = gee_iterator_get (_tmp99_);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			port = (gchar*) _tmp100_;
-#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp101_ = detected_map;
-#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp102_ = port;
-#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp103_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp102_);
-#line 316 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			name = (gchar*) _tmp103_;
-#line 317 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp89_ = _port_it;
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp90_ = gee_iterator_get (_tmp89_);
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			port = (gchar*) _tmp90_;
+#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp91_ = detected_map;
+#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp92_ = port;
+#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp93_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp92_);
+#line 211 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			name = (gchar*) _tmp93_;
+#line 212 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			display_name = NULL;
-#line 318 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 213 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			icon = NULL;
-#line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp104_ = port;
-#line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp105_ = camera_table_get_port_uri (_tmp104_);
-#line 319 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			uri = _tmp105_;
-#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp106_ = self->priv->camera_map;
-#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp107_ = uri;
-#line 321 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp107_)) {
-#line 3223 "CameraTable.c"
-				const gchar* _tmp108_;
-				const gchar* _tmp109_;
-#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp108_ = name;
-#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp109_ = port;
-#line 323 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				g_debug ("CameraTable.vala:323: %s @ %s already registered, skipping", _tmp108_, _tmp109_);
-#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp94_ = port;
+#line 214 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp95_ = camera_table_get_port_uri (_tmp94_);
+#line 214 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			uri = _tmp95_;
+#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp96_ = self->priv->camera_map;
+#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp97_ = uri;
+#line 216 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp97_)) {
+#line 2685 "CameraTable.c"
+				const gchar* _tmp98_;
+				const gchar* _tmp99_;
+#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp98_ = name;
+#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp99_ = port;
+#line 218 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				g_debug ("CameraTable.vala:218: %s @ %s already registered, skipping", _tmp98_, _tmp99_);
+#line 220 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (uri);
-#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 220 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (icon);
-#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 220 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (display_name);
-#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 220 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (name);
-#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 220 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (port);
-#line 325 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 220 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				continue;
-#line 3244 "CameraTable.c"
+#line 2706 "CameraTable.c"
 			}
-#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp110_ = port;
-#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp111_ = camera_table_get_port_path (_tmp110_);
-#line 329 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			path = _tmp111_;
-#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp112_ = path;
-#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			if (NULL != _tmp112_) {
-#line 3256 "CameraTable.c"
+#line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp100_ = port;
+#line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp101_ = camera_table_get_port_path (_tmp100_);
+#line 224 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			path = _tmp101_;
+#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp102_ = path;
+#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			if (NULL != _tmp102_) {
+#line 2718 "CameraTable.c"
 				GUdevDevice* device = NULL;
-				GUdevClient* _tmp113_;
-				const gchar* _tmp114_;
-				GUdevDevice* _tmp115_;
+				GUdevClient* _tmp103_;
+				const gchar* _tmp104_;
+				GUdevDevice* _tmp105_;
 				gchar* serial = NULL;
-				GUdevDevice* _tmp116_;
-				const gchar* _tmp117_;
-				gchar* _tmp118_;
-				const gchar* _tmp119_;
-				const gchar* _tmp124_;
-				const gchar* _tmp128_;
-#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp113_ = self->priv->client;
-#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp114_ = path;
-#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp115_ = g_udev_client_query_by_device_file (_tmp113_, _tmp114_);
-#line 331 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				device = _tmp115_;
-#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp116_ = device;
-#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp117_ = g_udev_device_get_property (_tmp116_, "ID_SERIAL_SHORT");
-#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp118_ = g_strdup (_tmp117_);
-#line 332 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				serial = _tmp118_;
-#line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp119_ = serial;
-#line 333 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				if (NULL != _tmp119_) {
-#line 3288 "CameraTable.c"
-					const gchar* _tmp120_;
-					gchar* _tmp121_;
-					const gchar* _tmp122_;
-					gchar* _tmp123_;
-#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp120_ = serial;
-#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp121_ = camera_table_get_name_for_uuid (self, _tmp120_);
-#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				GUdevDevice* _tmp106_;
+				const gchar* _tmp107_;
+				gchar* _tmp108_;
+				const gchar* _tmp109_;
+				const gchar* _tmp114_;
+				const gchar* _tmp118_;
+#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp103_ = self->priv->client;
+#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp104_ = path;
+#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp105_ = g_udev_client_query_by_device_file (_tmp103_, _tmp104_);
+#line 226 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				device = _tmp105_;
+#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp106_ = device;
+#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp107_ = g_udev_device_get_property (_tmp106_, "ID_SERIAL_SHORT");
+#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp108_ = g_strdup (_tmp107_);
+#line 227 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				serial = _tmp108_;
+#line 228 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp109_ = serial;
+#line 228 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				if (NULL != _tmp109_) {
+#line 2750 "CameraTable.c"
+					const gchar* _tmp110_;
+					gchar* _tmp111_;
+					const gchar* _tmp112_;
+					gchar* _tmp113_;
+#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp110_ = serial;
+#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp111_ = camera_table_get_name_for_uuid (self, _tmp110_);
+#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 335 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					display_name = _tmp121_;
-#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp122_ = serial;
-#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp123_ = camera_table_get_icon_for_uuid (self, _tmp122_);
-#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 230 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					display_name = _tmp111_;
+#line 231 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp112_ = serial;
+#line 231 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp113_ = camera_table_get_icon_for_uuid (self, _tmp112_);
+#line 231 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 336 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					icon = _tmp123_;
-#line 3309 "CameraTable.c"
+#line 231 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					icon = _tmp113_;
+#line 2771 "CameraTable.c"
 				}
-#line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp124_ = display_name;
-#line 338 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				if (NULL == _tmp124_) {
-#line 3315 "CameraTable.c"
-					GUdevDevice* _tmp125_;
-					const gchar* _tmp126_;
-					gchar* _tmp127_;
-#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp125_ = device;
-#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp126_ = g_udev_device_get_sysfs_attr (_tmp125_, "product");
-#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp127_ = g_strdup (_tmp126_);
-#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp114_ = display_name;
+#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				if (NULL == _tmp114_) {
+#line 2777 "CameraTable.c"
+					GUdevDevice* _tmp115_;
+					const gchar* _tmp116_;
+					gchar* _tmp117_;
+#line 234 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp115_ = device;
+#line 234 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp116_ = g_udev_device_get_sysfs_attr (_tmp115_, "product");
+#line 234 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp117_ = g_strdup (_tmp116_);
+#line 234 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 339 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					display_name = _tmp127_;
-#line 3329 "CameraTable.c"
+#line 234 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					display_name = _tmp117_;
+#line 2791 "CameraTable.c"
 				}
-#line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp128_ = display_name;
-#line 341 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				if (NULL == _tmp128_) {
-#line 3335 "CameraTable.c"
-					GUdevDevice* _tmp129_;
-					const gchar* _tmp130_;
-					gchar* _tmp131_;
-#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp129_ = device;
-#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp130_ = g_udev_device_get_property (_tmp129_, "ID_MODEL");
-#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp131_ = g_strdup (_tmp130_);
-#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp118_ = display_name;
+#line 236 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				if (NULL == _tmp118_) {
+#line 2797 "CameraTable.c"
+					GUdevDevice* _tmp119_;
+					const gchar* _tmp120_;
+					gchar* _tmp121_;
+#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp119_ = device;
+#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp120_ = g_udev_device_get_property (_tmp119_, "ID_MODEL");
+#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp121_ = g_strdup (_tmp120_);
+#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 342 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					display_name = _tmp131_;
-#line 3349 "CameraTable.c"
+#line 237 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					display_name = _tmp121_;
+#line 2811 "CameraTable.c"
 				}
-#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (serial);
-#line 330 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_object_unref0 (device);
-#line 3355 "CameraTable.c"
+#line 2817 "CameraTable.c"
 			}
-#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp132_ = port;
-#line 346 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			if (g_str_has_prefix (_tmp132_, "disk:")) {
-#line 3361 "CameraTable.c"
+#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp122_ = port;
+#line 241 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			if (g_str_has_prefix (_tmp122_, "disk:")) {
+#line 2823 "CameraTable.c"
 				{
 					GMount* mount = NULL;
-					const gchar* _tmp133_;
+					const gchar* _tmp123_;
+					gchar* _tmp124_;
+					gchar* _tmp125_;
+					GFile* _tmp126_;
+					GFile* _tmp127_;
+					GMount* _tmp128_;
+					GMount* _tmp129_;
+					GVolume* volume = NULL;
+					GMount* _tmp130_;
+					GVolume* _tmp131_;
+					const gchar* _tmp132_;
+					GVolume* _tmp133_;
 					gchar* _tmp134_;
 					gchar* _tmp135_;
-					GFile* _tmp136_;
-					GFile* _tmp137_;
-					GMount* _tmp138_;
-					GMount* _tmp139_;
-					GVolume* volume = NULL;
-					GMount* _tmp140_;
-					GVolume* _tmp141_;
-					const gchar* _tmp142_;
-					GVolume* _tmp143_;
-					gchar* _tmp144_;
-					gchar* _tmp145_;
-					gchar* _tmp146_;
-					GVolume* _tmp147_;
-					GIcon* _tmp148_;
-					GIcon* _tmp149_;
-					gchar* _tmp150_;
-#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp133_ = port;
-#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp134_ = string_substring (_tmp133_, (glong) 5, (glong) -1);
-#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp135_ = _tmp134_;
-#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp136_ = g_file_new_for_path (_tmp135_);
-#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp137_ = _tmp136_;
-#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp138_ = g_file_find_enclosing_mount (_tmp137_, NULL, &_inner_error_);
-#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp139_ = _tmp138_;
-#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_g_object_unref0 (_tmp137_);
-#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_g_free0 (_tmp135_);
-#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					mount = _tmp139_;
-#line 348 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					gchar* _tmp136_;
+					GVolume* _tmp137_;
+					GIcon* _tmp138_;
+					GIcon* _tmp139_;
+					gchar* _tmp140_;
+#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp123_ = port;
+#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp124_ = string_substring (_tmp123_, (glong) 5, (glong) -1);
+#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp125_ = _tmp124_;
+#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp126_ = g_file_new_for_path (_tmp125_);
+#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp127_ = _tmp126_;
+#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp128_ = g_file_find_enclosing_mount (_tmp127_, NULL, &_inner_error_);
+#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp129_ = _tmp128_;
+#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_g_object_unref0 (_tmp127_);
+#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_g_free0 (_tmp125_);
+#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					mount = _tmp129_;
+#line 243 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3405 "CameraTable.c"
+#line 2867 "CameraTable.c"
 						goto __catch67_g_error;
 					}
-#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp140_ = mount;
-#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp141_ = g_mount_get_volume (_tmp140_);
-#line 349 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					volume = _tmp141_;
-#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp142_ = name;
-#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp143_ = volume;
-#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp144_ = g_volume_get_name (_tmp143_);
-#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp145_ = _tmp144_;
-#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp146_ = g_strdup_printf (_ ("%s (%s)"), _tmp142_, _tmp145_);
-#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp130_ = mount;
+#line 244 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp131_ = g_mount_get_volume (_tmp130_);
+#line 244 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					volume = _tmp131_;
+#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp132_ = name;
+#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp133_ = volume;
+#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp134_ = g_volume_get_name (_tmp133_);
+#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp135_ = _tmp134_;
+#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp136_ = g_strdup_printf (_ ("%s (%s)"), _tmp132_, _tmp135_);
+#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					display_name = _tmp146_;
-#line 351 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_g_free0 (_tmp145_);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp147_ = volume;
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp148_ = g_volume_get_icon (_tmp147_);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp149_ = _tmp148_;
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_tmp150_ = g_icon_to_string (_tmp149_);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					display_name = _tmp136_;
+#line 246 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_g_free0 (_tmp135_);
+#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp137_ = volume;
+#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp138_ = g_volume_get_icon (_tmp137_);
+#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp139_ = _tmp138_;
+#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_tmp140_ = g_icon_to_string (_tmp139_);
+#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					icon = _tmp150_;
-#line 352 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_g_object_unref0 (_tmp149_);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					icon = _tmp140_;
+#line 247 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+					_g_object_unref0 (_tmp139_);
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (volume);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (mount);
-#line 3448 "CameraTable.c"
+#line 2910 "CameraTable.c"
 				}
 				goto __finally67;
 				__catch67_g_error:
 				{
 					GError* e = NULL;
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					e = _inner_error_;
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_inner_error_ = NULL;
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_error_free0 (e);
-#line 3460 "CameraTable.c"
+#line 2922 "CameraTable.c"
 				}
 				__finally67:
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_propagate_error (error, _inner_error_);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (path);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (uri);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (icon);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (display_name);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (_port_it);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3495 "CameraTable.c"
+#line 2955 "CameraTable.c"
 					} else {
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (path);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (uri);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (icon);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (display_name);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (_port_it);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_clear_error (&_inner_error_);
-#line 347 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3527 "CameraTable.c"
+#line 2985 "CameraTable.c"
 					}
 				}
 			}
-#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp151_ = display_name;
-#line 356 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			if (NULL == _tmp151_) {
-#line 3535 "CameraTable.c"
-				const gchar* _tmp152_;
-				gchar* _tmp153_;
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp152_ = name;
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp153_ = g_strdup (_tmp152_);
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp141_ = display_name;
+#line 251 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			if (NULL == _tmp141_) {
+#line 2993 "CameraTable.c"
+				const gchar* _tmp142_;
+				gchar* _tmp143_;
+#line 253 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp142_ = name;
+#line 253 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp143_ = g_strdup (_tmp142_);
+#line 253 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				_g_free0 (display_name);
-#line 358 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				display_name = _tmp153_;
-#line 3546 "CameraTable.c"
+#line 253 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				display_name = _tmp143_;
+#line 3004 "CameraTable.c"
 			}
-#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp154_ = port_info_list;
-#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp155_ = port;
-#line 360 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			index = gp_port_info_list_lookup_path (_tmp154_, _tmp155_);
-#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp156_ = index;
-#line 361 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			if (_tmp156_ < 0) {
-#line 3558 "CameraTable.c"
-				gint _tmp157_;
-				const gchar* _tmp158_;
-				gchar* _tmp159_;
-				gchar* _tmp160_;
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp157_ = index;
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp158_ = port;
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp159_ = g_strdup_printf ("lookup port %s", _tmp158_);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp160_ = _tmp159_;
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				camera_table_do_op (self, (int) _tmp157_, _tmp160_, &_inner_error_);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_g_free0 (_tmp160_);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 255 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp144_ = port_info_list;
+#line 255 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp145_ = port;
+#line 255 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			index = gp_port_info_list_lookup_path (_tmp144_, _tmp145_);
+#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp146_ = index;
+#line 256 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			if (_tmp146_ < 0) {
+#line 3016 "CameraTable.c"
+				gint _tmp147_;
+				const gchar* _tmp148_;
+				gchar* _tmp149_;
+				gchar* _tmp150_;
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp147_ = index;
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp148_ = port;
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp149_ = g_strdup_printf ("lookup port %s", _tmp148_);
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp150_ = _tmp149_;
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				camera_table_do_op (self, (int) _tmp147_, _tmp150_, &_inner_error_);
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_g_free0 (_tmp150_);
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_propagate_error (error, _inner_error_);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (path);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (uri);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (icon);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (display_name);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (_port_it);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3607 "CameraTable.c"
+#line 3063 "CameraTable.c"
 					} else {
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (path);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (uri);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (icon);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (display_name);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (_port_it);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_clear_error (&_inner_error_);
-#line 362 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3639 "CameraTable.c"
+#line 3093 "CameraTable.c"
 					}
 				}
 			}
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp161_ = port_info_list;
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp162_ = index;
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp164_ = gp_port_info_list_get_info (_tmp161_, _tmp162_, &_tmp163_);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp151_ = port_info_list;
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp152_ = index;
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp154_ = gp_port_info_list_get_info (_tmp151_, _tmp152_, &_tmp153_);
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			 (port_info);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			port_info = _tmp163_;
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp165_ = port;
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp166_ = g_strdup_printf ("get port info for %s", _tmp165_);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp167_ = _tmp166_;
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_table_do_op (self, _tmp164_, _tmp167_, &_inner_error_);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_g_free0 (_tmp167_);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			port_info = _tmp153_;
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp155_ = port;
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp156_ = g_strdup_printf ("get port info for %s", _tmp155_);
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp157_ = _tmp156_;
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_table_do_op (self, _tmp154_, _tmp157_, &_inner_error_);
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_g_free0 (_tmp157_);
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3699 "CameraTable.c"
+#line 3151 "CameraTable.c"
 				} else {
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_clear_error (&_inner_error_);
-#line 367 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3735 "CameraTable.c"
+#line 3185 "CameraTable.c"
 				}
 			}
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			gp_port_info_get_path (port_info, &_tmp168_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 263 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			gp_port_info_get_path (port_info, &_tmp158_);
+#line 263 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (tmp_path);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp169_ = g_strdup (_tmp168_);
-#line 368 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			tmp_path = _tmp169_;
-#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp170_ = port;
-#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp171_ = tmp_path;
-#line 371 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_vala_assert (g_strcmp0 (_tmp170_, _tmp171_) == 0, "port == tmp_path");
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp172_ = self->priv->abilities_list;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp173_ = name;
-#line 373 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			index = gp_abilities_list_lookup_model (_tmp172_, _tmp173_);
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp174_ = index;
-#line 374 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			if (_tmp174_ < 0) {
-#line 3762 "CameraTable.c"
-				gint _tmp175_;
-				const gchar* _tmp176_;
-				gchar* _tmp177_;
-				gchar* _tmp178_;
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp175_ = index;
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp176_ = name;
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp177_ = g_strdup_printf ("lookup camera model %s", _tmp176_);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_tmp178_ = _tmp177_;
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				camera_table_do_op (self, (int) _tmp175_, _tmp178_, &_inner_error_);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-				_g_free0 (_tmp178_);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 263 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp159_ = g_strdup (_tmp158_);
+#line 263 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			tmp_path = _tmp159_;
+#line 266 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp160_ = port;
+#line 266 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp161_ = tmp_path;
+#line 266 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_vala_assert (g_strcmp0 (_tmp160_, _tmp161_) == 0, "port == tmp_path");
+#line 268 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp162_ = self->priv->abilities_list;
+#line 268 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp163_ = name;
+#line 268 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			index = gp_abilities_list_lookup_model (_tmp162_, _tmp163_);
+#line 269 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp164_ = index;
+#line 269 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			if (_tmp164_ < 0) {
+#line 3212 "CameraTable.c"
+				gint _tmp165_;
+				const gchar* _tmp166_;
+				gchar* _tmp167_;
+				gchar* _tmp168_;
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp165_ = index;
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp166_ = name;
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp167_ = g_strdup_printf ("lookup camera model %s", _tmp166_);
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_tmp168_ = _tmp167_;
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				camera_table_do_op (self, (int) _tmp165_, _tmp168_, &_inner_error_);
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+				_g_free0 (_tmp168_);
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_propagate_error (error, _inner_error_);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (tmp_path);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						 (port_info);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (path);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (uri);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (icon);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (display_name);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (_port_it);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3815 "CameraTable.c"
+#line 3263 "CameraTable.c"
 					} else {
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (tmp_path);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						 (port_info);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (path);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (uri);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (icon);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (display_name);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (name);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_free0 (port);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (_port_it);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-						usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_g_object_unref0 (detected_map);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_list_unref0 (camera_list);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						_gp_port_info_list_free0 (port_info_list);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						g_clear_error (&_inner_error_);
-#line 375 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 						return;
-#line 3851 "CameraTable.c"
+#line 3297 "CameraTable.c"
 					}
 				}
 			}
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp179_ = self->priv->abilities_list;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp180_ = index;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp182_ = gp_abilities_list_get_abilities (_tmp179_, _tmp180_, &_tmp181_);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp169_ = self->priv->abilities_list;
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp170_ = index;
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp172_ = gp_abilities_list_get_abilities (_tmp169_, _tmp170_, &_tmp171_);
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			 (camera_abilities);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_abilities = _tmp181_;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp183_ = name;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp184_ = g_strdup_printf ("lookup camera abilities for %s", _tmp183_);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp185_ = _tmp184_;
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_table_do_op (self, _tmp182_, _tmp185_, &_inner_error_);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_g_free0 (_tmp185_);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_abilities = _tmp171_;
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp173_ = name;
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp174_ = g_strdup_printf ("lookup camera abilities for %s", _tmp173_);
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp175_ = _tmp174_;
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_table_do_op (self, _tmp172_, _tmp175_, &_inner_error_);
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_g_free0 (_tmp175_);
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3913 "CameraTable.c"
+#line 3357 "CameraTable.c"
 				} else {
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_clear_error (&_inner_error_);
-#line 378 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 3951 "CameraTable.c"
+#line 3393 "CameraTable.c"
 				}
 			}
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp187_ = gp_camera_new (&_tmp186_);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp177_ = gp_camera_new (&_tmp176_);
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_camera_unref0 (gcamera);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			gcamera = _tmp186_;
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp188_ = name;
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp189_ = g_strdup_printf ("create camera object for %s", _tmp188_);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp190_ = _tmp189_;
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_table_do_op (self, _tmp187_, _tmp190_, &_inner_error_);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_g_free0 (_tmp190_);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			gcamera = _tmp176_;
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp178_ = name;
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp179_ = g_strdup_printf ("create camera object for %s", _tmp178_);
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp180_ = _tmp179_;
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_table_do_op (self, _tmp177_, _tmp180_, &_inner_error_);
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_g_free0 (_tmp180_);
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 4010 "CameraTable.c"
+#line 3450 "CameraTable.c"
 				} else {
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_clear_error (&_inner_error_);
-#line 382 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 277 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 4050 "CameraTable.c"
+#line 3488 "CameraTable.c"
 				}
 			}
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp191_ = gcamera;
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp192_ = camera_abilities;
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp193_ = name;
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp194_ = g_strdup_printf ("set camera abilities for %s", _tmp193_);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp195_ = _tmp194_;
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_table_do_op (self, gp_camera_set_abilities (_tmp191_, _tmp192_), _tmp195_, &_inner_error_);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_g_free0 (_tmp195_);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp181_ = gcamera;
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp182_ = camera_abilities;
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp183_ = name;
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp184_ = g_strdup_printf ("set camera abilities for %s", _tmp183_);
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp185_ = _tmp184_;
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_table_do_op (self, gp_camera_set_abilities (_tmp181_, _tmp182_), _tmp185_, &_inner_error_);
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_g_free0 (_tmp185_);
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 4107 "CameraTable.c"
+#line 3543 "CameraTable.c"
 				} else {
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_clear_error (&_inner_error_);
-#line 383 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 4147 "CameraTable.c"
+#line 3581 "CameraTable.c"
 				}
 			}
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp196_ = gcamera;
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp197_ = port_info;
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp198_ = name;
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp199_ = port;
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp200_ = g_strdup_printf ("set port info for %s on %s", _tmp198_, _tmp199_);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp201_ = _tmp200_;
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera_table_do_op (self, gp_camera_set_port_info (_tmp196_, _tmp197_), _tmp201_, &_inner_error_);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_g_free0 (_tmp201_);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp186_ = gcamera;
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp187_ = port_info;
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp188_ = name;
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp189_ = port;
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp190_ = g_strdup_printf ("set port info for %s on %s", _tmp188_, _tmp189_);
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp191_ = _tmp190_;
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera_table_do_op (self, gp_camera_set_port_info (_tmp186_, _tmp187_), _tmp191_, &_inner_error_);
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_g_free0 (_tmp191_);
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 				if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 4206 "CameraTable.c"
+#line 3638 "CameraTable.c"
 				} else {
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_camera_unref0 (gcamera);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (camera_abilities);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (tmp_path);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					 (port_info);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (path);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (uri);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (icon);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (display_name);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (name);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (port);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (_port_it);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_object_unref0 (detected_map);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_list_unref0 (camera_list);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_gp_port_info_list_free0 (port_info_list);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					g_clear_error (&_inner_error_);
-#line 384 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					return;
-#line 4246 "CameraTable.c"
+#line 3676 "CameraTable.c"
 				}
 			}
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp202_ = name;
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp203_ = port;
-#line 386 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			g_debug ("CameraTable.vala:386: Adding to camera table: %s @ %s", _tmp202_, _tmp203_);
-#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp204_ = gcamera;
-#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp205_ = uri;
-#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp206_ = display_name;
-#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp207_ = icon;
-#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp208_ = discovered_camera_new (_tmp204_, _tmp205_, _tmp206_, _tmp207_);
-#line 388 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			camera = _tmp208_;
-#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp209_ = self->priv->camera_map;
-#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp210_ = uri;
-#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp211_ = camera;
-#line 389 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp209_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp210_, _tmp211_);
-#line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_tmp212_ = camera;
-#line 391 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp212_);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 281 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp192_ = name;
+#line 281 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp193_ = port;
+#line 281 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			g_debug ("CameraTable.vala:281: Adding to camera table: %s @ %s", _tmp192_, _tmp193_);
+#line 283 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp194_ = gcamera;
+#line 283 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp195_ = uri;
+#line 283 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp196_ = display_name;
+#line 283 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp197_ = icon;
+#line 283 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp198_ = discovered_camera_new (_tmp194_, _tmp195_, _tmp196_, _tmp197_);
+#line 283 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			camera = _tmp198_;
+#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp199_ = self->priv->camera_map;
+#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp200_ = uri;
+#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp201_ = camera;
+#line 284 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp199_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp200_, _tmp201_);
+#line 286 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			_tmp202_ = camera;
+#line 286 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+			g_signal_emit (self, camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL], 0, _tmp202_);
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_discovered_camera_unref0 (camera);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_gp_camera_unref0 (gcamera);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			 (camera_abilities);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (tmp_path);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			 (port_info);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (path);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (uri);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (icon);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (display_name);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (name);
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_g_free0 (port);
-#line 4301 "CameraTable.c"
+#line 3731 "CameraTable.c"
 		}
-#line 315 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_object_unref0 (_port_it);
-#line 4305 "CameraTable.c"
+#line 3735 "CameraTable.c"
 	}
-#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	missing = (_vala_array_free (missing, missing_length1, (GDestroyNotify) discovered_camera_unref), NULL);
-#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	usb_cameras = (_vala_array_free (usb_cameras, usb_cameras_length1, (GDestroyNotify) g_free), NULL);
-#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_g_object_unref0 (detected_map);
-#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_gp_list_unref0 (camera_list);
-#line 233 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 139 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_gp_port_info_list_free0 (port_info_list);
-#line 4317 "CameraTable.c"
+#line 3745 "CameraTable.c"
 }
 
 
@@ -4326,21 +3752,21 @@ camera_table_on_udev_event (CameraTable* self,
 {
 	const gchar* _tmp0_;
 	OneShotScheduler* _tmp1_;
-#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (action != NULL);
-#line 395 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 290 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (G_UDEV_IS_DEVICE (device));
-#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp0_ = g_udev_device_get_name (device);
-#line 396 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-	g_debug ("CameraTable.vala:396: udev event: %s on %s", action, _tmp0_);
-#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+	g_debug ("CameraTable.vala:291: udev event: %s on %s", action, _tmp0_);
+#line 295 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp1_ = self->priv->camera_update_scheduler;
-#line 400 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 295 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	one_shot_scheduler_after_timeout (_tmp1_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4342 "CameraTable.c"
+#line 3770 "CameraTable.c"
 }
 
 
@@ -4349,15 +3775,15 @@ camera_table_on_volume_changed (CameraTable* self,
                                 GVolume* volume)
 {
 	OneShotScheduler* _tmp0_;
-#line 403 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 298 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 403 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 298 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (G_IS_VOLUME (volume));
-#line 404 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 299 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_tmp0_ = self->priv->camera_update_scheduler;
-#line 404 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 299 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	one_shot_scheduler_after_timeout (_tmp0_, (guint) CAMERA_TABLE_UPDATE_DELAY_MSEC, TRUE);
-#line 4359 "CameraTable.c"
+#line 3787 "CameraTable.c"
 }
 
 
@@ -4365,34 +3791,34 @@ static void
 camera_table_on_update_cameras (CameraTable* self)
 {
 	GError * _inner_error_ = NULL;
-#line 407 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 302 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	g_return_if_fail (IS_CAMERA_TABLE (self));
-#line 4369 "CameraTable.c"
+#line 3797 "CameraTable.c"
 	{
 		CameraTable* _tmp0_;
 		CameraTable* _tmp1_;
-#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp0_ = camera_table_get_instance ();
-#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp1_ = _tmp0_;
-#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_update_camera_table (_tmp1_, &_inner_error_);
-#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_camera_table_unref0 (_tmp1_);
-#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
-#line 4385 "CameraTable.c"
+#line 3813 "CameraTable.c"
 				goto __catch68_gphoto_error;
 			}
-#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_clear_error (&_inner_error_);
-#line 409 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return;
-#line 4394 "CameraTable.c"
+#line 3822 "CameraTable.c"
 		}
 	}
 	goto __finally68;
@@ -4401,30 +3827,30 @@ camera_table_on_update_cameras (CameraTable* self)
 		GError* err = NULL;
 		GError* _tmp2_;
 		const gchar* _tmp3_;
-#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		err = _inner_error_;
-#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_inner_error_ = NULL;
-#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp2_ = err;
-#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_tmp3_ = _tmp2_->message;
-#line 411 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-		g_warning ("CameraTable.vala:411: Error updating camera table: %s", _tmp3_);
-#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+		g_warning ("CameraTable.vala:306: Error updating camera table: %s", _tmp3_);
+#line 303 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		_g_error_free0 (err);
-#line 4415 "CameraTable.c"
+#line 3843 "CameraTable.c"
 	}
 	__finally68:
-#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_clear_error (&_inner_error_);
-#line 408 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return;
-#line 4426 "CameraTable.c"
+#line 3854 "CameraTable.c"
 	}
 }
 
@@ -4451,19 +3877,19 @@ g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure,
 		data1 = closure->data;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4453 "CameraTable.c"
+#line 3881 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		data2 = closure->data;
-#line 4459 "CameraTable.c"
+#line 3887 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	callback = (GMarshalFunc_VOID__DISCOVERED_CAMERA) (marshal_data ? marshal_data : cc->callback);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	callback (data1, value_get_discovered_camera (param_values + 1), data2);
-#line 4465 "CameraTable.c"
+#line 3893 "CameraTable.c"
 }
 
 
@@ -4472,7 +3898,7 @@ value_camera_table_init (GValue* value)
 {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	value->data[0].v_pointer = NULL;
-#line 4474 "CameraTable.c"
+#line 3902 "CameraTable.c"
 }
 
 
@@ -4483,7 +3909,7 @@ value_camera_table_free_value (GValue* value)
 	if (value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_unref (value->data[0].v_pointer);
-#line 4485 "CameraTable.c"
+#line 3913 "CameraTable.c"
 	}
 }
 
@@ -4496,11 +3922,11 @@ value_camera_table_copy_value (const GValue* src_value,
 	if (src_value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		dest_value->data[0].v_pointer = camera_table_ref (src_value->data[0].v_pointer);
-#line 4498 "CameraTable.c"
+#line 3926 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4502 "CameraTable.c"
+#line 3930 "CameraTable.c"
 	}
 }
 
@@ -4510,7 +3936,7 @@ value_camera_table_peek_pointer (const GValue* value)
 {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return value->data[0].v_pointer;
-#line 4512 "CameraTable.c"
+#line 3940 "CameraTable.c"
 }
 
 
@@ -4522,30 +3948,30 @@ value_camera_table_collect_value (GValue* value,
 {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (collect_values[0].v_pointer) {
-#line 4524 "CameraTable.c"
+#line 3952 "CameraTable.c"
 		CameraTable * object;
 		object = collect_values[0].v_pointer;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4531 "CameraTable.c"
+#line 3959 "CameraTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4535 "CameraTable.c"
+#line 3963 "CameraTable.c"
 		}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = camera_table_ref (object);
-#line 4539 "CameraTable.c"
+#line 3967 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 4543 "CameraTable.c"
+#line 3971 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 4547 "CameraTable.c"
+#line 3975 "CameraTable.c"
 }
 
 
@@ -4561,25 +3987,25 @@ value_camera_table_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4563 "CameraTable.c"
+#line 3991 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (!value->data[0].v_pointer) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = NULL;
-#line 4569 "CameraTable.c"
+#line 3997 "CameraTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4573 "CameraTable.c"
+#line 4001 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		*object_p = camera_table_ref (value->data[0].v_pointer);
-#line 4577 "CameraTable.c"
+#line 4005 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return NULL;
-#line 4581 "CameraTable.c"
+#line 4009 "CameraTable.c"
 }
 
 
@@ -4599,7 +4025,7 @@ param_spec_camera_table (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return G_PARAM_SPEC (spec);
-#line 4601 "CameraTable.c"
+#line 4029 "CameraTable.c"
 }
 
 
@@ -4610,7 +4036,7 @@ value_get_camera_table (const GValue* value)
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CAMERA_TABLE), NULL);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return value->data[0].v_pointer;
-#line 4612 "CameraTable.c"
+#line 4040 "CameraTable.c"
 }
 
 
@@ -4633,17 +4059,17 @@ value_set_camera_table (GValue* value,
 		value->data[0].v_pointer = v_object;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_ref (value->data[0].v_pointer);
-#line 4635 "CameraTable.c"
+#line 4063 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 4639 "CameraTable.c"
+#line 4067 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_unref (old);
-#line 4645 "CameraTable.c"
+#line 4073 "CameraTable.c"
 	}
 }
 
@@ -4665,17 +4091,17 @@ value_take_camera_table (GValue* value,
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 4667 "CameraTable.c"
+#line 4095 "CameraTable.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 4671 "CameraTable.c"
+#line 4099 "CameraTable.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (old) {
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		camera_table_unref (old);
-#line 4677 "CameraTable.c"
+#line 4105 "CameraTable.c"
 	}
 }
 
@@ -4693,7 +4119,7 @@ camera_table_class_init (CameraTableClass * klass)
 	camera_table_signals[CAMERA_TABLE_CAMERA_ADDED_SIGNAL] = g_signal_new ("camera-added", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	camera_table_signals[CAMERA_TABLE_CAMERA_REMOVED_SIGNAL] = g_signal_new ("camera-removed", TYPE_CAMERA_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA, G_TYPE_NONE, 1, TYPE_DISCOVERED_CAMERA);
-#line 4695 "CameraTable.c"
+#line 4123 "CameraTable.c"
 }
 
 
@@ -4721,7 +4147,7 @@ camera_table_instance_init (CameraTable * self)
 	self->priv->camera_map = _tmp2_;
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	self->ref_count = 1;
-#line 4723 "CameraTable.c"
+#line 4151 "CameraTable.c"
 }
 
 
@@ -4745,7 +4171,7 @@ camera_table_finalize (CameraTable * obj)
 	_g_object_unref0 (self->priv->volume_monitor);
 #line 35 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	_g_object_unref0 (self->priv->camera_map);
-#line 4747 "CameraTable.c"
+#line 4175 "CameraTable.c"
 }
 
 
@@ -4774,7 +4200,7 @@ camera_table_ref (gpointer instance)
 	g_atomic_int_inc (&self->ref_count);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	return instance;
-#line 4776 "CameraTable.c"
+#line 4204 "CameraTable.c"
 }
 
 
@@ -4789,7 +4215,7 @@ camera_table_unref (gpointer instance)
 		CAMERA_TABLE_GET_CLASS (self)->finalize (self);
 #line 21 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4791 "CameraTable.c"
+#line 4219 "CameraTable.c"
 	}
 }
 
diff --git a/src/camera/CameraTable.vala b/src/camera/CameraTable.vala
index 1636816..3df4ad6 100644
--- a/src/camera/CameraTable.vala
+++ b/src/camera/CameraTable.vala
@@ -108,100 +108,6 @@ public class CameraTable {
         do_op(abilities_list.load(null_context), "load camera abilities list");
     }
     
-    private string[] get_all_usb_cameras() {
-        string[] cameras = new string[0];
-        
-        GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null);
-        foreach (GUdev.Device device in device_list) {
-            string device_file = device.get_device_file();
-            if(
-                // only keep devices that have a non-null device file and that
-                // have both the ID_GPHOTO2 and GPHOTO2_DRIVER properties set
-                (device_file != null) &&
-                (device.has_property("ID_GPHOTO2")) &&
-                (device.has_property("GPHOTO2_DRIVER"))
-            ) {
-                int camera_bus, camera_device;
-                // extract the bus and device IDs from the device file string
-                // TODO: is it safe to parse the absolute path or should we be
-                // smarter and use a regex to only pick up the end of the path?
-                if (device_file.scanf("/dev/bus/usb/%d/%d", out camera_bus, out camera_device) < 2) {
-                    critical("get_all_usb_cameras: Failed to scanf device file %s", device_file);
-                    
-                    continue;
-                }
-                string camera = "usb:%.3d,%.3d".printf(camera_bus, camera_device);
-                debug("USB camera detected at %s", camera);
-                cameras += camera;
-            }
-        }
-        
-        return cameras;
-    }
-    
-    // USB (or libusb) is a funny beast; if only one USB device is present (i.e. the camera),
-    // then a single camera is detected at port usb:.  However, if multiple USB devices are
-    // present (including non-cameras), then the first attached camera will be listed twice,
-    // first at usb:, then at usb:xxx,yyy.  If the usb: device is removed, another usb:xxx,yyy
-    // device will lose its full-path name and be referred to as usb: only.
-    //
-    // This function gleans the full port name of a particular port, even if it's the unadorned
-    // "usb:", by using GUdev.
-    private bool usb_esp(int current_camera_count, string[] usb_cameras, string port, 
-        out string full_port) {
-        // sanity
-        assert(current_camera_count > 0);
-        
-        debug("USB ESP: current_camera_count=%d port=%s", current_camera_count, port);
-        
-        full_port = null;
-        
-        // if GPhoto detects one camera, and USB reports one camera, all is swell
-        if (current_camera_count == 1 && usb_cameras.length == 1) {
-            full_port = usb_cameras[0];
-            
-            debug("USB ESP: port=%s full_port=%s", port, full_port);
-            
-            return true;
-        }
-
-        // with more than one camera, skip the mirrored "usb:" port
-        if (port == "usb:") {
-            debug("USB ESP: Skipping %s", port);
-            
-            return false;
-        }
-        
-        // parse out the bus and device ID
-        int bus, device;
-        if (port.scanf("usb:%d,%d", out bus, out device) < 2) {
-            critical("USB ESP: Failed to scanf %s", port);
-            
-            return false;
-        }
-        
-        foreach (string usb_camera in usb_cameras) {
-            int camera_bus, camera_device;
-            if (usb_camera.scanf("usb:%d,%d", out camera_bus, out camera_device) < 2) {
-                critical("USB ESP: Failed to scanf %s", usb_camera);
-                
-                continue;
-            }
-            
-            if ((bus == camera_bus) && (device == camera_device)) {
-                full_port = port;
-                
-                debug("USB ESP: port=%s full_port=%s", port, full_port);
-
-                return true;
-            }
-        }
-        
-        debug("USB ESP: No matching bus/device found for port=%s", port);
-        
-        return false;
-    }
-    
     public static string get_port_uri(string port) {
         return "gphoto2://[%s]/".printf(port);
     }
@@ -242,9 +148,6 @@ public class CameraTable {
         
         Gee.HashMap<string, string> detected_map = new Gee.HashMap<string, string>();
         
-        // walk the USB chain and find all PTP cameras; this is necessary for usb_esp
-        string[] usb_cameras = get_all_usb_cameras();
-        
         // go through the detected camera list and glean their ports
         for (int ctr = 0; ctr < camera_list.count(); ctr++) {
             string name;
@@ -255,14 +158,6 @@ public class CameraTable {
             
             debug("Detected %d/%d %s @ %s", ctr + 1, camera_list.count(), name, port);
             
-            // do some USB ESP, skipping ports that cannot be deduced
-            if (port.has_prefix("usb:")) {
-                string full_port;
-                if (!usb_esp(camera_list.count(), usb_cameras, port, out full_port))
-                    continue;
-                
-                port = full_port;
-            }
 
             detected_map.set(port, name);
         }
diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c
index e7ae485..a1ebfb1 100644
--- a/src/data_imports/DataImports.c
+++ b/src/data_imports/DataImports.c
@@ -27,7 +27,7 @@
 
 
 void data_imports_init (GError** error);
-static void _vala_array_add71 (gchar** * array,
+static void _vala_array_add70 (gchar** * array,
                         int* length,
                         int* size,
                         gchar* value);
@@ -47,7 +47,7 @@ static void _vala_array_free (gpointer array,
 
 
 static void
-_vala_array_add71 (gchar** * array,
+_vala_array_add70 (gchar** * array,
                    int* length,
                    int* size,
                    gchar* value)
@@ -95,7 +95,7 @@ data_imports_init (GError** error)
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	_tmp2_ = g_strdup ("org.yorba.shotwell.dataimports.fspot");
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
-	_vala_array_add71 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
+	_vala_array_add70 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
 #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	_tmp3_ = core_ids;
 #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c
index 6b42fc1..8b74806 100644
--- a/src/data_imports/DataImportsPluginHost.c
+++ b/src/data_imports/DataImportsPluginHost.c
@@ -785,7 +785,7 @@ GeeCollection* plugins_get_pluggables_for_type (GType type,
                                                 GDestroyNotify compare_func_target_destroy_notify,
                                                 gboolean include_disabled);
 gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
-static void _vala_array_add72 (SpitDataImportsService** * array,
+static void _vala_array_add71 (SpitDataImportsService** * array,
                         int* length,
                         int* size,
                         SpitDataImportsService* value);
@@ -3259,7 +3259,7 @@ spit_data_imports_load_all_services (int* result_length1)
 
 
 static void
-_vala_array_add72 (SpitDataImportsService** * array,
+_vala_array_add71 (SpitDataImportsService** * array,
                    int* length,
                    int* size,
                    SpitDataImportsService* value)
@@ -3450,7 +3450,7 @@ spit_data_imports_load_services (gboolean load_all,
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp22_ = _g_object_ref0 (_tmp21_);
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_vala_array_add72 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp22_);
+			_vala_array_add71 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp22_);
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_g_object_unref0 (service);
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index 906dbab..929209d 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -2134,7 +2134,7 @@ static void _vala_array_free (gpointer array,
                        GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
 
-static const gchar* LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES[3] = {"gphoto2:", "disk:", "file:"};
+static const gchar* LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES[4] = {"gphoto2:", "disk:", "file:", "mtp:"};
 const GtkTargetEntry LIBRARY_WINDOW_DND_TARGET_ENTRIES[3] = {{"text/uri-list", (guint) GTK_TARGET_OTHER_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_URI_LIST}, {LIBRARY_WINDOW_MEDIA_LIST_MIME_TYPE, (guint) GTK_TARGET_SAME_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST}, {LIBRARY_WINDOW_TAG_PATH_MIME_TYPE, (guint) GTK_TARGET_SAME_WIDGET, (guint) LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH}};
 static const GActionEntry LIBRARY_WINDOW_common_actions[13] = {{"CommonFileImport", _library_window_on_file_import_gsimple_action_activate_callback}, {"ExternalLibraryImport", _library_window_on_external_library_import_gsimple_action_activate_callback}, {"CommonPreferences", _library_window_on_preferences_gsimple_action_activate_callback}, {"CommonEmptyTrash", _library_window_on_empty_trash_gsimple_action_activate_callback}, {"CommonJumpToEvent", _library_window_on_jump_to_event_gsimple_action_activate_callback}, {"CommonFind", _library_window_on_find_gsimple_action_activate_callback}, {"CommonNewSearch", _library_window_on_new_search_gsimple_action_activate_callback}, {"CommonDisplayBasicProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_basic_properties_gsimple_action_change_state_callback}, {"CommonDisplayExtendedProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_extended_properties_gsimple_action_change_state_callback}, {"CommonDisplaySearchbar", NULL, NULL, "false", _library_window_on_display_searchbar_gsimple_action_change_state_callback}, {"CommonDisplaySidebar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_sidebar_gsimple_action_change_state_callback}, {"CommonDisplayToolbar", NULL, NULL, "true", _library_window_on_display_toolbar_gsimple_action_change_state_callback}, {"CommonSortEvents", _library_window_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _library_window_on_events_sort_changed_gsimple_action_change_state_callback}};
 
@@ -2144,7 +2144,7 @@ _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender,
                                                            Page* page,
                                                            gpointer self)
 {
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_page_created ((LibraryWindow*) self, entry, page);
 #line 2150 "LibraryWindow.c"
 }
@@ -2156,7 +2156,7 @@ _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _s
                                                                  Page* page,
                                                                  gpointer self)
 {
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_destroying_page ((LibraryWindow*) self, entry, page);
 #line 2162 "LibraryWindow.c"
 }
@@ -2167,7 +2167,7 @@ _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTr
                                                                        SidebarSelectableEntry* selectable,
                                                                        gpointer self)
 {
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_entry_selected ((LibraryWindow*) self, selectable);
 #line 2173 "LibraryWindow.c"
 }
@@ -2178,7 +2178,7 @@ _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_re
                                                                                        SidebarSelectableEntry* removed,
                                                                                        gpointer self)
 {
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_selected_entry_removed ((LibraryWindow*) self, removed);
 #line 2184 "LibraryWindow.c"
 }
@@ -2188,7 +2188,7 @@ static void
 _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender,
                                                           gpointer self)
 {
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_extended_properties ((LibraryWindow*) self);
 #line 2194 "LibraryWindow.c"
 }
@@ -2198,7 +2198,7 @@ static void
 _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender,
                                                           gpointer self)
 {
-#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_extended_properties ((LibraryWindow*) self);
 #line 2204 "LibraryWindow.c"
 }
@@ -2210,7 +2210,7 @@ _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_co
                                                                                                 GeeCollection* removed,
                                                                                                 gpointer self)
 {
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_trashcan_contents_altered ((LibraryWindow*) self);
 #line 2216 "LibraryWindow.c"
 }
@@ -2221,7 +2221,7 @@ _library_window_on_media_altered_data_collection_items_altered (DataCollection*
                                                                 GeeMap* items,
                                                                 gpointer self)
 {
-#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_media_altered ((LibraryWindow*) self);
 #line 2227 "LibraryWindow.c"
 }
@@ -2233,7 +2233,7 @@ _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWr
                                                                       guint total,
                                                                       gpointer self)
 {
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_metadata_writer_progress ((LibraryWindow*) self, completed, total);
 #line 2239 "LibraryWindow.c"
 }
@@ -2244,7 +2244,7 @@ _library_window_on_library_monitor_installed_library_monitor_pool_monitor_instal
                                                                                      LibraryMonitor* monitor,
                                                                                      gpointer self)
 {
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_installed ((LibraryWindow*) self, monitor);
 #line 2250 "LibraryWindow.c"
 }
@@ -2255,7 +2255,7 @@ _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destro
                                                                                      LibraryMonitor* monitor,
                                                                                      gpointer self)
 {
-#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_destroyed ((LibraryWindow*) self, monitor);
 #line 2261 "LibraryWindow.c"
 }
@@ -2266,7 +2266,7 @@ _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender,
                                                            DiscoveredCamera* camera,
                                                            gpointer self)
 {
-#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_camera_added ((LibraryWindow*) self, camera);
 #line 2272 "LibraryWindow.c"
 }
@@ -2305,7 +2305,7 @@ _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction*
                                                                  GVariant* parameter,
                                                                  gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_file_import ((LibraryWindow*) self);
 #line 2311 "LibraryWindow.c"
 }
@@ -2316,7 +2316,7 @@ _library_window_on_external_library_import_gsimple_action_activate_callback (GSi
                                                                              GVariant* parameter,
                                                                              gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_external_library_import ((LibraryWindow*) self);
 #line 2322 "LibraryWindow.c"
 }
@@ -2327,7 +2327,7 @@ _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction*
                                                                  GVariant* parameter,
                                                                  gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_preferences ((LibraryWindow*) self);
 #line 2333 "LibraryWindow.c"
 }
@@ -2338,7 +2338,7 @@ _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction*
                                                                  GVariant* parameter,
                                                                  gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_empty_trash ((LibraryWindow*) self);
 #line 2344 "LibraryWindow.c"
 }
@@ -2349,7 +2349,7 @@ _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction
                                                                    GVariant* parameter,
                                                                    gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_jump_to_event ((LibraryWindow*) self);
 #line 2355 "LibraryWindow.c"
 }
@@ -2360,7 +2360,7 @@ _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action,
                                                           GVariant* parameter,
                                                           gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_find ((LibraryWindow*) self);
 #line 2366 "LibraryWindow.c"
 }
@@ -2371,7 +2371,7 @@ _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* a
                                                                 GVariant* parameter,
                                                                 gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_new_search ((LibraryWindow*) self);
 #line 2377 "LibraryWindow.c"
 }
@@ -2382,7 +2382,7 @@ _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction
                                                                    GVariant* parameter,
                                                                    gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_action_toggle ((LibraryWindow*) self, action, parameter);
 #line 2388 "LibraryWindow.c"
 }
@@ -2393,7 +2393,7 @@ _library_window_on_display_basic_properties_gsimple_action_change_state_callback
                                                                                   GVariant* value,
                                                                                   gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_basic_properties ((LibraryWindow*) self, action, value);
 #line 2399 "LibraryWindow.c"
 }
@@ -2404,7 +2404,7 @@ _library_window_on_display_extended_properties_gsimple_action_change_state_callb
                                                                                      GVariant* value,
                                                                                      gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_extended_properties ((LibraryWindow*) self, action, value);
 #line 2410 "LibraryWindow.c"
 }
@@ -2415,7 +2415,7 @@ _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimp
                                                                            GVariant* value,
                                                                            gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_searchbar ((LibraryWindow*) self, action, value);
 #line 2421 "LibraryWindow.c"
 }
@@ -2426,7 +2426,7 @@ _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimple
                                                                          GVariant* value,
                                                                          gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_sidebar ((LibraryWindow*) self, action, value);
 #line 2432 "LibraryWindow.c"
 }
@@ -2437,7 +2437,7 @@ _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimple
                                                                          GVariant* value,
                                                                          gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_toolbar ((LibraryWindow*) self, action, value);
 #line 2443 "LibraryWindow.c"
 }
@@ -2448,7 +2448,7 @@ _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction*
                                                                   GVariant* parameter,
                                                                   gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_action_radio ((LibraryWindow*) self, action, parameter);
 #line 2454 "LibraryWindow.c"
 }
@@ -2459,7 +2459,7 @@ _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSi
                                                                              GVariant* value,
                                                                              gpointer self)
 {
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_events_sort_changed ((LibraryWindow*) self, action, value);
 #line 2465 "LibraryWindow.c"
 }
@@ -2473,7 +2473,7 @@ _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDra
                                                                           guint time,
                                                                           gpointer self)
 {
-#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_external_drop_handler ((LibraryWindow*) self, context, entry, data, info, time);
 #line 2479 "LibraryWindow.c"
 }
@@ -2482,7 +2482,7 @@ _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDra
 static void
 _library_window_on_update_properties_now_one_shot_callback (gpointer self)
 {
-#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties_now ((LibraryWindow*) self);
 #line 2488 "LibraryWindow.c"
 }
@@ -2545,117 +2545,117 @@ library_window_construct (GType object_type,
 	CameraTable* _tmp55_;
 	CameraTable* _tmp56_;
 	GtkProgressBar* _tmp57_;
-#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	static const gchar* accels[3] = {"<Primary>f", "F8", NULL};
-#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = (LibraryWindow*) app_window_construct (object_type);
-#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = sidebar_tree_new (LIBRARY_WINDOW_DND_TARGET_ENTRIES, G_N_ELEMENTS (LIBRARY_WINDOW_DND_TARGET_ENTRIES), GDK_ACTION_ASK, _library_window_external_drop_handler_sidebar_tree_external_drop_handler, self);
-#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->sidebar_tree);
-#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->sidebar_tree = _tmp0_;
-#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->sidebar_tree;
-#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp1_, "page-created", (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self, 0);
 #line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp1_, "page-created", (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self, 0);
+#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp2_, "destroying-page", (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self, 0);
 #line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp2_, "destroying-page", (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self, 0);
+#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->sidebar_tree;
-#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp3_, "entry-selected", (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self, 0);
 #line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp3_, "entry-selected", (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self, 0);
+#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->sidebar_tree;
-#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp4_, "selected-entry-removed", (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self, 0);
-#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->sidebar_tree;
-#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->library_branch;
-#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY);
 #line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY);
+#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = self->priv->sidebar_tree;
-#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->tags_branch;
-#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS);
 #line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS);
+#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->sidebar_tree;
-#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->folders_branch;
-#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS);
 #line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS);
+#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = self->priv->sidebar_tree;
-#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->events_branch;
-#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS);
 #line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS);
+#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->sidebar_tree;
-#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = self->priv->camera_branch;
-#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS);
 #line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS);
+#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->sidebar_tree;
-#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->saved_search_branch;
-#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sidebar_tree_graft (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_SAVED_SEARCH);
-#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = extended_properties_window_new (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp17_);
-#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->extended_properties);
-#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->extended_properties = _tmp17_;
 #line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->extended_properties = _tmp17_;
+#line 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = self->priv->extended_properties;
-#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "hide", (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self, 0);
 #line 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "hide", (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self, 0);
+#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = self->priv->extended_properties;
-#line 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), "show", (GCallback) _library_window_show_extended_properties_gtk_widget_show, self, 0);
-#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = one_shot_scheduler_new ("LibraryWindow properties", _library_window_on_update_properties_now_one_shot_callback, self);
-#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_one_shot_scheduler_unref0 (self->priv->properties_scheduler);
-#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->properties_scheduler = _tmp20_;
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = self->priv->search_actions;
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = search_filter_toolbar_new (_tmp21_);
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp22_);
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->search_toolbar);
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->search_toolbar = _tmp22_;
-#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->library_branch;
-#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = library_branch_get_photos_entry (_tmp23_);
-#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = _tmp24_;
-#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp27_ = _tmp26_;
-#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_create_layout (self, _tmp27_);
-#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp27_);
-#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_load_configuration (self);
 #line 2661 "LibraryWindow.c"
 	{
@@ -2666,25 +2666,25 @@ library_window_construct (GType object_type,
 		GeeCollection* _tmp31_;
 		GeeIterator* _tmp32_;
 		GeeIterator* _tmp33_;
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = media_collection_registry_get_instance ();
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _tmp28_;
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp30_ = media_collection_registry_get_all (_tmp29_);
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp31_ = _tmp30_;
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp32_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp33_ = _tmp32_;
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp31_);
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_collection_registry_unref0 (_tmp29_);
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_sources_it = _tmp33_;
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
 #line 2690 "LibraryWindow.c"
 			GeeIterator* _tmp34_;
@@ -2693,125 +2693,125 @@ library_window_construct (GType object_type,
 			gpointer _tmp36_;
 			MediaSourceCollection* _tmp37_;
 			MediaSourceCollection* _tmp38_;
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp34_ = _media_sources_it;
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (!gee_iterator_next (_tmp34_)) {
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
 #line 2703 "LibraryWindow.c"
 			}
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp35_ = _media_sources_it;
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp36_ = gee_iterator_get (_tmp35_);
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			media_sources = (MediaSourceCollection*) _tmp36_;
 #line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			media_sources = (MediaSourceCollection*) _tmp36_;
+#line 189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp37_ = media_sources;
-#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_connect_object (_tmp37_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0);
 #line 189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			g_signal_connect_object (_tmp37_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0);
+#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp38_ = media_sources;
-#line 189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0);
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
 #line 2721 "LibraryWindow.c"
 		}
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
 #line 2725 "LibraryWindow.c"
 	}
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp39_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST];
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST];
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = g_new0 (GtkTargetEntry, 2);
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_[0] = _tmp39_;
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_[1] = _tmp40_;
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets = _tmp41_;
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets_length1 = 2;
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_main_window_dnd_targets_size_ = main_window_dnd_targets_length1;
-#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = main_window_dnd_targets;
-#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42__length1 = main_window_dnd_targets_length1;
-#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp42_, _tmp42__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK);
-#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = metadata_writer_get_instance ();
-#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = _tmp43_;
-#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp44_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0);
-#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp44_);
-#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp45_ = library_monitor_pool_get_instance ();
-#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp46_ = _tmp45_;
-#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp47_ = library_monitor_pool_get_monitor (_tmp46_);
-#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp48_ = _tmp47_;
-#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp46_);
-#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	monitor = _tmp48_;
 #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	monitor = _tmp48_;
+#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp49_ = monitor;
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp49_ != NULL) {
 #line 2773 "LibraryWindow.c"
 		LibraryMonitor* _tmp50_;
-#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp50_ = monitor;
-#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_library_monitor_installed (self, _tmp50_);
 #line 2779 "LibraryWindow.c"
 	}
-#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp51_ = library_monitor_pool_get_instance ();
-#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp52_ = _tmp51_;
-#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp52_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0);
-#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp52_);
 #line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_library_monitor_pool_unref0 (_tmp52_);
+#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp53_ = library_monitor_pool_get_instance ();
-#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp54_ = _tmp53_;
-#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp54_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0);
-#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp54_);
-#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp55_ = camera_table_get_instance ();
-#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp56_ = _tmp55_;
-#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp56_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0);
-#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_camera_table_unref0 (_tmp56_);
-#line 214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp57_ = self->priv->background_progress_bar;
-#line 214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_show_text (_tmp57_, TRUE);
-#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	application_set_accels_for_action ("win.CommonDisplaySearchbar", accels, G_N_ELEMENTS (accels));
-#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (monitor);
-#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets = (g_free (main_window_dnd_targets), NULL);
-#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self;
 #line 2817 "LibraryWindow.c"
 }
@@ -2821,7 +2821,7 @@ LibraryWindow*
 library_window_new (ProgressMonitor progress_monitor,
                     void* progress_monitor_target)
 {
-#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return library_window_construct (TYPE_LIBRARY_WINDOW, progress_monitor, progress_monitor_target);
 #line 2827 "LibraryWindow.c"
 }
@@ -2831,7 +2831,7 @@ static void
 _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender,
                                                                                           gpointer self)
 {
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_started ((LibraryWindow*) self);
 #line 2837 "LibraryWindow.c"
 }
@@ -2841,7 +2841,7 @@ static void
 _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender,
                                                                                               gpointer self)
 {
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
 #line 2847 "LibraryWindow.c"
 }
@@ -2851,7 +2851,7 @@ static void
 _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender,
                                                                                  gpointer self)
 {
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
 #line 2857 "LibraryWindow.c"
 }
@@ -2863,7 +2863,7 @@ _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_upd
                                                                                               gint total_files,
                                                                                               gpointer self)
 {
-#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_update_progress ((LibraryWindow*) self, completed_files, total_files);
 #line 2869 "LibraryWindow.c"
 }
@@ -2873,7 +2873,7 @@ static void
 _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender,
                                                                                                 gpointer self)
 {
-#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_import_preparing ((LibraryWindow*) self);
 #line 2879 "LibraryWindow.c"
 }
@@ -2885,7 +2885,7 @@ _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_imp
                                                                                               guint64 total_bytes,
                                                                                               gpointer self)
 {
-#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_import_progress ((LibraryWindow*) self, completed_bytes, total_bytes);
 #line 2891 "LibraryWindow.c"
 }
@@ -2899,35 +2899,35 @@ library_window_on_library_monitor_installed (LibraryWindow* self,
 	GFile* _tmp1_;
 	gchar* _tmp2_;
 	gchar* _tmp3_;
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
 #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
+#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:251: on_library_monitor_installed: %s", _tmp3_);
-#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:252: on_library_monitor_installed: %s", _tmp3_);
+#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp3_);
-#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0);
 #line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0);
 #line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0);
 #line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (monitor, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0);
 #line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (monitor, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0);
+	g_signal_connect_object (monitor, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0);
 #line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (monitor, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0);
+#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (monitor, "auto-import-progress", (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self, 0);
 #line 2933 "LibraryWindow.c"
 }
@@ -2947,47 +2947,47 @@ library_window_on_library_monitor_destroyed (LibraryWindow* self,
 	guint _tmp7_;
 	guint _tmp8_;
 	guint _tmp9_;
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
 #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
+#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:262: on_library_monitor_destroyed: %s", _tmp3_);
-#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:263: on_library_monitor_destroyed: %s", _tmp3_);
+#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp3_);
-#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp4_, NULL, FALSE);
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self);
 #line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self);
+#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp5_, NULL, FALSE);
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self);
 #line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self);
+#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE);
-#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self);
 #line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self);
+#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp7_, NULL, FALSE);
-#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self);
 #line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self);
+#line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp8_, NULL, FALSE);
-#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self);
 #line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self);
+#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp9_, NULL, FALSE);
-#line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self);
 #line 2993 "LibraryWindow.c"
 }
@@ -2996,7 +2996,7 @@ library_window_on_library_monitor_destroyed (LibraryWindow* self,
 static GVariant*
 _variant_new1 (gboolean value)
 {
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 3002 "LibraryWindow.c"
 }
@@ -3005,7 +3005,7 @@ _variant_new1 (gboolean value)
 static GVariant*
 _variant_new2 (gboolean value)
 {
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 3011 "LibraryWindow.c"
 }
@@ -3014,7 +3014,7 @@ _variant_new2 (gboolean value)
 static GVariant*
 _variant_new3 (gboolean value)
 {
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 3020 "LibraryWindow.c"
 }
@@ -3036,49 +3036,49 @@ library_window_real_add_actions (AppWindow* base)
 	GVariant* _tmp9_;
 	GAction* _tmp10_;
 	GVariant* _tmp11_;
-#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	APP_WINDOW_CLASS (library_window_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), LIBRARY_WINDOW_common_actions, G_N_ELEMENTS (LIBRARY_WINDOW_common_actions), self);
+	APP_WINDOW_CLASS (library_window_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
 #line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), LIBRARY_WINDOW_common_actions, G_N_ELEMENTS (LIBRARY_WINDOW_common_actions), self);
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_actions;
-#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = search_filter_actions_get_actions (_tmp0_, &_tmp1_);
-#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->search_actions;
-#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), _tmp2_, _tmp1_, _tmp3_);
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _variant_new1 (configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp4_, _tmp7_);
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp7_);
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp6_);
 #line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp6_);
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySidebar");
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _variant_new2 (library_window_is_sidebar_visible (self));
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp8_, _tmp9_);
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp9_);
 #line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp9_);
+#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayToolbar");
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = _variant_new3 (library_window_is_toolbar_visible (self));
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp10_, _tmp11_);
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp11_);
 #line 3084 "LibraryWindow.c"
 }
@@ -3089,7 +3089,7 @@ _library_window_on_view_filter_installed_view_collection_view_filter_installed (
                                                                                 ViewFilter* filer,
                                                                                 gpointer self)
 {
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_installed ((LibraryWindow*) self, filer);
 #line 3095 "LibraryWindow.c"
 }
@@ -3100,7 +3100,7 @@ _library_window_on_view_filter_removed_view_collection_view_filter_removed (View
                                                                             ViewFilter* filer,
                                                                             gpointer self)
 {
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_removed ((LibraryWindow*) self, filer);
 #line 3106 "LibraryWindow.c"
 }
@@ -3113,15 +3113,15 @@ library_window_real_switched_pages (PageWindow* base,
 {
 	LibraryWindow * self;
 	SearchFilterActions* _tmp10_;
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
 #line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
+#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_WINDOW_CLASS (library_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), old_page, new_page);
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (old_page != NULL) {
 #line 3127 "LibraryWindow.c"
 		ViewCollection* _tmp0_;
@@ -3130,56 +3130,56 @@ library_window_real_switched_pages (PageWindow* base,
 		ViewCollection* _tmp3_;
 		ViewCollection* _tmp4_;
 		guint _tmp5_;
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = page_get_view (old_page);
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _tmp0_;
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_parse_name ("view-filter-installed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE);
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self);
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_data_collection_unref0 (_tmp1_);
 #line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_data_collection_unref0 (_tmp1_);
+#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = page_get_view (old_page);
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_parse_name ("view-filter-removed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE);
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self);
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp4_);
 #line 3154 "LibraryWindow.c"
 	}
-#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (new_page != NULL) {
 #line 3158 "LibraryWindow.c"
 		ViewCollection* _tmp6_;
 		ViewCollection* _tmp7_;
 		ViewCollection* _tmp8_;
 		ViewCollection* _tmp9_;
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = page_get_view (new_page);
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_connect_object (_tmp7_, "view-filter-installed", (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self, 0);
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_data_collection_unref0 (_tmp7_);
 #line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_data_collection_unref0 (_tmp7_);
+#line 315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page_get_view (new_page);
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_connect_object (_tmp9_, "view-filter-removed", (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self, 0);
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp9_);
 #line 3179 "LibraryWindow.c"
 	}
-#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->search_actions;
-#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_actions_monitor_page_contents (_tmp10_, old_page, new_page);
 #line 3185 "LibraryWindow.c"
 }
@@ -3189,7 +3189,7 @@ static void
 _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender,
                                                               gpointer self)
 {
-#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_refreshed ((LibraryWindow*) self);
 #line 3195 "LibraryWindow.c"
 }
@@ -3199,11 +3199,11 @@ static void
 library_window_on_view_filter_installed (LibraryWindow* self,
                                          ViewFilter* filter)
 {
-#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_VIEW_FILTER (filter));
 #line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_VIEW_FILTER (filter));
+#line 322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (filter, "refresh", (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self, 0);
 #line 3209 "LibraryWindow.c"
 }
@@ -3214,13 +3214,13 @@ library_window_on_view_filter_removed (LibraryWindow* self,
                                        ViewFilter* filter)
 {
 	guint _tmp0_;
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_VIEW_FILTER (filter));
 #line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_VIEW_FILTER (filter));
+#line 326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp0_, NULL, FALSE);
-#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (filter, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self);
 #line 3226 "LibraryWindow.c"
 }
@@ -3229,7 +3229,7 @@ library_window_on_view_filter_removed (LibraryWindow* self,
 static gpointer
 _g_object_ref0 (gpointer self)
 {
-#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self ? g_object_ref (self) : NULL;
 #line 3235 "LibraryWindow.c"
 }
@@ -3238,7 +3238,7 @@ _g_object_ref0 (gpointer self)
 static GVariant*
 _variant_new4 (gboolean value)
 {
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 3244 "LibraryWindow.c"
 }
@@ -3256,52 +3256,52 @@ library_window_on_view_filter_refreshed (LibraryWindow* self)
 	GAction* _tmp5_;
 	GAction* _tmp6_;
 	GAction* _tmp7_;
-#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = !view_collection_are_items_filtered_out (_tmp3_);
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp4_) {
 #line 332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp4_) {
+#line 333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 3280 "LibraryWindow.c"
 	}
-#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
-#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _g_object_ref0 (_tmp5_);
-#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp6_;
-#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = action;
-#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp7_ != NULL) {
 #line 3292 "LibraryWindow.c"
 		GAction* _tmp8_;
 		GVariant* _tmp9_;
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = action;
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _variant_new4 (TRUE);
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_action_change_state (_tmp8_, _tmp9_);
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_variant_unref0 (_tmp9_);
 #line 3303 "LibraryWindow.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
 #line 3307 "LibraryWindow.c"
 }
@@ -3326,79 +3326,79 @@ library_window_real_show_all (GtkWidget* base)
 	CheckerboardPage* _tmp11_;
 	CheckerboardPage* _tmp12_;
 	CheckerboardPage* _tmp14_;
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	GTK_WIDGET_CLASS (library_window_parent_class)->show_all (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget));
-#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_common_action (_tmp1_, "CommonDisplayBasicProperties", TRUE);
-#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	basic_properties_action = _tmp3_;
-#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = basic_properties_action;
-#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp4_ != NULL, "basic_properties_action != null");
-#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = basic_properties_action;
-#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = g_action_get_state (_tmp5_);
-#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = !g_variant_get_boolean (_tmp7_);
-#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp7_);
-#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
 #line 3362 "LibraryWindow.c"
 		GtkFrame* _tmp9_;
-#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 351 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->bottom_frame;
-#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 351 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
 #line 3368 "LibraryWindow.c"
 	}
-#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp10_) : NULL;
-#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_ == NULL) {
-#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp10_);
 #line 3378 "LibraryWindow.c"
 	}
-#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	current_page = _tmp11_;
 #line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	current_page = _tmp11_;
+#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = current_page;
-#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ != NULL) {
 #line 3386 "LibraryWindow.c"
 		CheckerboardPage* _tmp13_;
-#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = current_page;
-#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_init_view_filter (self, _tmp13_);
 #line 3392 "LibraryWindow.c"
 	}
-#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = current_page;
-#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_toggle_search_bar (self, library_window_should_show_search_bar (self), _tmp14_);
-#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_sidebar_visible (self, library_window_is_sidebar_visible (self));
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_properties_action);
 #line 3404 "LibraryWindow.c"
 }
@@ -3411,17 +3411,17 @@ library_window_get_app (void)
 	AppWindow* _tmp0_;
 	AppWindow* _tmp1_;
 	LibraryWindow* _tmp2_;
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_WINDOW), "instance is LibraryWindow");
-#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = app_window_instance;
-#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_WINDOW, LibraryWindow));
-#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
-#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 3427 "LibraryWindow.c"
 }
@@ -3431,7 +3431,7 @@ gboolean
 library_window_is_mount_uri_supported (const gchar* uri)
 {
 	gboolean result = FALSE;
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (uri != NULL, FALSE);
 #line 3437 "LibraryWindow.c"
 	{
@@ -3439,43 +3439,43 @@ library_window_is_mount_uri_supported (const gchar* uri)
 		gint scheme_collection_length1 = 0;
 		gint _scheme_collection_size_ = 0;
 		gint scheme_it = 0;
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		scheme_collection = LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES;
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		scheme_collection_length1 = G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES);
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (scheme_it = 0; scheme_it < G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); scheme_it = scheme_it + 1) {
 #line 3449 "LibraryWindow.c"
 			gchar* _tmp0_;
 			gchar* scheme = NULL;
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp0_ = g_strdup (scheme_collection[scheme_it]);
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			scheme = _tmp0_;
 #line 3456 "LibraryWindow.c"
 			{
 				const gchar* _tmp1_;
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp1_ = scheme;
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				if (g_str_has_prefix (uri, _tmp1_)) {
 #line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				if (g_str_has_prefix (uri, _tmp1_)) {
+#line 374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					result = TRUE;
-#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (scheme);
-#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					return result;
 #line 3469 "LibraryWindow.c"
 				}
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (scheme);
 #line 3473 "LibraryWindow.c"
 			}
 		}
 	}
-#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 3481 "LibraryWindow.c"
 }
@@ -3487,13 +3487,13 @@ library_window_real_get_app_role (AppWindow* base)
 	LibraryWindow * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_strdup (RESOURCES_APP_LIBRARY_ROLE);
-#line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 3499 "LibraryWindow.c"
 }
@@ -3507,36 +3507,36 @@ library_window_rename_tag_in_sidebar (LibraryWindow* self,
 	TagsBranch* _tmp0_;
 	TagsSidebarEntry* _tmp1_;
 	TagsSidebarEntry* _tmp2_;
-#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_TAG (tag));
 #line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_TAG (tag));
+#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->tags_branch;
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = tags_branch_get_entry_for_tag (_tmp0_, tag);
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp1_;
 #line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = _tmp1_;
+#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = entry;
-#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
 #line 3525 "LibraryWindow.c"
 		SidebarTree* _tmp3_;
 		TagsSidebarEntry* _tmp4_;
-#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->sidebar_tree;
-#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_rename_entry_in_place (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 3534 "LibraryWindow.c"
 	} else {
-#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:388: No tag entry found for rename");
+#line 389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:389: No tag entry found for rename");
 #line 3538 "LibraryWindow.c"
 	}
-#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
 #line 3542 "LibraryWindow.c"
 }
@@ -3550,36 +3550,36 @@ library_window_rename_event_in_sidebar (LibraryWindow* self,
 	EventsBranch* _tmp0_;
 	EventsEventEntry* _tmp1_;
 	EventsEventEntry* _tmp2_;
-#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_EVENT (event));
 #line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_EVENT (event));
+#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->events_branch;
-#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = events_branch_get_entry_for_event (_tmp0_, event);
-#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp1_;
 #line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = _tmp1_;
+#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = entry;
-#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
 #line 3568 "LibraryWindow.c"
 		SidebarTree* _tmp3_;
 		EventsEventEntry* _tmp4_;
-#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->sidebar_tree;
-#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_rename_entry_in_place (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 3577 "LibraryWindow.c"
 	} else {
-#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:396: No event entry found for rename");
+#line 397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:397: No event entry found for rename");
 #line 3581 "LibraryWindow.c"
 	}
-#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
 #line 3585 "LibraryWindow.c"
 }
@@ -3593,36 +3593,36 @@ library_window_rename_search_in_sidebar (LibraryWindow* self,
 	SearchesBranch* _tmp0_;
 	SearchesSidebarEntry* _tmp1_;
 	SearchesSidebarEntry* _tmp2_;
-#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_SAVED_SEARCH (search));
 #line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_SAVED_SEARCH (search));
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->saved_search_branch;
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = searches_branch_get_entry_for_saved_search (_tmp0_, search);
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp1_;
 #line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = _tmp1_;
+#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = entry;
-#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
 #line 3611 "LibraryWindow.c"
 		SidebarTree* _tmp3_;
 		SearchesSidebarEntry* _tmp4_;
-#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->sidebar_tree;
-#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_rename_entry_in_place (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 3620 "LibraryWindow.c"
 	} else {
-#line 404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:404: No search entry found for rename");
+#line 405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:405: No search entry found for rename");
 #line 3624 "LibraryWindow.c"
 	}
-#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
 #line 3628 "LibraryWindow.c"
 }
@@ -3641,35 +3641,35 @@ library_window_real_on_quit (AppWindow* base)
 	GtkPaned* _tmp6_;
 	gint _tmp7_;
 	gint _tmp8_;
-#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized;
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions;
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_library_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, &_tmp3_);
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->client_paned;
-#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = gtk_paned_get_position (_tmp6_);
-#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp8_);
-#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	APP_WINDOW_CLASS (library_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
 #line 3675 "LibraryWindow.c"
 }
@@ -3689,99 +3689,99 @@ library_window_get_start_fullscreen_photo (LibraryWindow* self,
 	Photo* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
 	GeeList* _tmp10_;
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL);
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL);
 #line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL);
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page));
-#line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp0_;
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = view;
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (view_collection_get_selected_count (_tmp2_) > 0) {
 #line 3705 "LibraryWindow.c"
 		ViewCollection* _tmp3_;
 		GeeList* _tmp4_;
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = view;
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = view_collection_get_selected_sources_of_type (_tmp3_, TYPE_LIBRARY_PHOTO);
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _tmp4_;
 #line 3716 "LibraryWindow.c"
 	} else {
 		ViewCollection* _tmp5_;
 		GeeList* _tmp6_;
-#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = view;
-#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = view_collection_get_sources_of_type (_tmp5_, TYPE_LIBRARY_PHOTO);
-#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _tmp6_;
 #line 3728 "LibraryWindow.c"
 	}
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _g_object_ref0 (_tmp1_);
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sources = _tmp7_;
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = sources;
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp10_ != NULL) {
 #line 3738 "LibraryWindow.c"
 		GeeList* _tmp11_;
 		gint _tmp12_;
 		gint _tmp13_;
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = sources;
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp13_ != 0;
 #line 3750 "LibraryWindow.c"
 	} else {
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = FALSE;
 #line 3754 "LibraryWindow.c"
 	}
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
 #line 3758 "LibraryWindow.c"
 		GeeList* _tmp14_;
 		gpointer _tmp15_;
-#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = sources;
-#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = gee_list_get (_tmp14_, 0);
-#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp8_);
-#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp15_, TYPE_PHOTO, Photo);
 #line 3769 "LibraryWindow.c"
 	} else {
-#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp8_);
-#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = NULL;
 #line 3775 "LibraryWindow.c"
 	}
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp8_;
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (sources);
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 3787 "LibraryWindow.c"
 }
@@ -3798,23 +3798,23 @@ library_window_get_fullscreen_photo (LibraryWindow* self,
 	Photo* _vala_start = NULL;
 	ViewCollection* _vala_view_collection = NULL;
 	gboolean result = FALSE;
-#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_PAGE (page), FALSE);
-#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_vala_collection);
-#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_collection = NULL;
 #line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_collection = NULL;
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_vala_start);
-#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_start = NULL;
 #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_start = NULL;
+#line 433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_vala_view_collection);
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_view_collection = NULL;
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_COLLECTION_PAGE)) {
 #line 3820 "LibraryWindow.c"
 		CollectionPage* _tmp0_;
@@ -3824,111 +3824,111 @@ library_window_get_fullscreen_photo (LibraryWindow* self,
 		Photo* _tmp3_;
 		Photo* _tmp4_;
 		Photo* _tmp5_;
-#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_COLLECTION_PAGE, CollectionPage));
-#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_collection = _tmp0_;
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_collection = _tmp0_;
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _vala_collection;
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = library_window_get_start_fullscreen_photo (self, _tmp1_);
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		photo = _tmp2_;
 #line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		photo = _tmp2_;
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = photo;
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp3_ == NULL) {
 #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp3_ == NULL) {
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo);
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
 #line 3852 "LibraryWindow.c"
 			} else {
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
 #line 3856 "LibraryWindow.c"
 			}
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
 #line 3862 "LibraryWindow.c"
 			} else {
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
 #line 3866 "LibraryWindow.c"
 			}
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
 #line 3872 "LibraryWindow.c"
 			} else {
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
 #line 3876 "LibraryWindow.c"
 			}
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
 #line 3880 "LibraryWindow.c"
 		}
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = photo;
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_start = _tmp5_;
 #line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_start = _tmp5_;
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = NULL;
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo);
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
 #line 3902 "LibraryWindow.c"
 		} else {
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
 #line 3906 "LibraryWindow.c"
 		}
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
 #line 3912 "LibraryWindow.c"
 		} else {
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
 #line 3916 "LibraryWindow.c"
 		}
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
 #line 3922 "LibraryWindow.c"
 		} else {
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
 #line 3926 "LibraryWindow.c"
 		}
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
 #line 3930 "LibraryWindow.c"
 	}
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_EVENTS_DIRECTORY_PAGE)) {
 #line 3934 "LibraryWindow.c"
 		ViewCollection* view = NULL;
@@ -3954,283 +3954,283 @@ library_window_get_fullscreen_photo (LibraryWindow* self,
 		Photo* _tmp22_;
 		Photo* _tmp23_;
 		Photo* _tmp24_;
-#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = page_get_view (page);
-#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		view = _tmp6_;
 #line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		view = _tmp6_;
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = view;
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)) == 0) {
 #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)) == 0) {
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
 #line 3974 "LibraryWindow.c"
 			} else {
-#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
 #line 3978 "LibraryWindow.c"
 			}
-#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
 #line 3984 "LibraryWindow.c"
 			} else {
-#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
 #line 3988 "LibraryWindow.c"
 			}
-#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
 #line 3994 "LibraryWindow.c"
 			} else {
-#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
 #line 3998 "LibraryWindow.c"
 			}
-#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
 #line 4002 "LibraryWindow.c"
 		}
-#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = view;
-#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), 0);
-#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_VIEW, DataView);
-#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = data_view_get_source (_tmp10_);
-#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_EVENT, Event);
-#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		event = _tmp12_;
 #line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		event = _tmp12_;
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = event;
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp13_ == NULL) {
 #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp13_ == NULL) {
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
 #line 4032 "LibraryWindow.c"
 			} else {
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
 #line 4036 "LibraryWindow.c"
 			}
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
 #line 4042 "LibraryWindow.c"
 			} else {
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
 #line 4046 "LibraryWindow.c"
 			}
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
 #line 4052 "LibraryWindow.c"
 			} else {
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
 #line 4056 "LibraryWindow.c"
 			}
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
 #line 4060 "LibraryWindow.c"
 		}
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = self->priv->events_branch;
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = event;
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = events_branch_get_entry_for_event (_tmp14_, _tmp15_);
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		entry = _tmp16_;
 #line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		entry = _tmp16_;
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = entry;
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp17_ == NULL) {
 #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp17_ == NULL) {
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (entry);
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
 #line 4086 "LibraryWindow.c"
 			} else {
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
 #line 4090 "LibraryWindow.c"
 			}
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
 #line 4096 "LibraryWindow.c"
 			} else {
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
 #line 4100 "LibraryWindow.c"
 			}
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
 #line 4106 "LibraryWindow.c"
 			} else {
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
 #line 4110 "LibraryWindow.c"
 			}
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
 #line 4114 "LibraryWindow.c"
 		}
-#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = entry;
-#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_collection = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_EVENT_PAGE, EventPage), TYPE_COLLECTION_PAGE, CollectionPage);
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_collection = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_EVENT_PAGE, EventPage), TYPE_COLLECTION_PAGE, CollectionPage);
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = _vala_collection;
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = library_window_get_start_fullscreen_photo (self, _tmp20_);
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		photo = _tmp21_;
 #line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		photo = _tmp21_;
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp22_ = photo;
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp22_ == NULL) {
 #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp22_ == NULL) {
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo);
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (entry);
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
 #line 4148 "LibraryWindow.c"
 			} else {
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
 #line 4152 "LibraryWindow.c"
 			}
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
 #line 4158 "LibraryWindow.c"
 			} else {
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
 #line 4162 "LibraryWindow.c"
 			}
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
 #line 4168 "LibraryWindow.c"
 			} else {
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
 #line 4172 "LibraryWindow.c"
 			}
-#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
 #line 4176 "LibraryWindow.c"
 		}
-#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = photo;
-#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_start = _tmp24_;
 #line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_start = _tmp24_;
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = NULL;
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo);
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (event);
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
 #line 4204 "LibraryWindow.c"
 		} else {
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
 #line 4208 "LibraryWindow.c"
 		}
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
 #line 4214 "LibraryWindow.c"
 		} else {
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
 #line 4218 "LibraryWindow.c"
 		}
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
 #line 4224 "LibraryWindow.c"
 		} else {
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
 #line 4228 "LibraryWindow.c"
 		}
-#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
 #line 4232 "LibraryWindow.c"
 	}
-#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_LIBRARY_PHOTO_PAGE)) {
 #line 4236 "LibraryWindow.c"
 		LibraryPhotoPage* photo_page = NULL;
@@ -4246,201 +4246,201 @@ library_window_get_fullscreen_photo (LibraryWindow* self,
 		Photo* _tmp33_;
 		LibraryPhotoPage* _tmp34_;
 		ViewCollection* _tmp35_;
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage));
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		photo_page = _tmp25_;
-#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp26_ = photo_page;
-#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = library_photo_page_get_controller_page (_tmp26_);
-#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		controller = _tmp27_;
 #line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		controller = _tmp27_;
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = controller;
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp28_ == NULL) {
 #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp28_ == NULL) {
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (controller);
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo_page);
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
 #line 4274 "LibraryWindow.c"
 			} else {
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
 #line 4278 "LibraryWindow.c"
 			}
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
 #line 4284 "LibraryWindow.c"
 			} else {
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
 #line 4288 "LibraryWindow.c"
 			}
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
 #line 4294 "LibraryWindow.c"
 			} else {
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
 #line 4298 "LibraryWindow.c"
 			}
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
 #line 4302 "LibraryWindow.c"
 		}
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = photo_page;
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
 #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (controller);
-#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo_page);
-#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
 #line 4318 "LibraryWindow.c"
 			} else {
-#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
 #line 4322 "LibraryWindow.c"
 			}
-#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
 #line 4328 "LibraryWindow.c"
 			} else {
-#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
 #line 4332 "LibraryWindow.c"
 			}
-#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
 #line 4338 "LibraryWindow.c"
 			} else {
-#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
 #line 4342 "LibraryWindow.c"
 			}
-#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
 #line 4346 "LibraryWindow.c"
 		}
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp30_ = controller;
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_collection = _tmp31_;
 #line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_collection = _tmp31_;
+#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp32_ = photo_page;
-#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp33_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_start = _tmp33_;
 #line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_start = _tmp33_;
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp34_ = photo_page;
-#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_PAGE, Page));
-#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = _tmp35_;
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (controller);
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo_page);
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
 #line 4382 "LibraryWindow.c"
 		} else {
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
 #line 4386 "LibraryWindow.c"
 		}
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
 #line 4392 "LibraryWindow.c"
 		} else {
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
 #line 4396 "LibraryWindow.c"
 		}
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
 #line 4402 "LibraryWindow.c"
 		} else {
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
 #line 4406 "LibraryWindow.c"
 		}
-#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
 #line 4410 "LibraryWindow.c"
 	}
-#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (collection) {
-#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*collection = _vala_collection;
 #line 4418 "LibraryWindow.c"
 	} else {
-#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
 #line 4422 "LibraryWindow.c"
 	}
-#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (start) {
-#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*start = _vala_start;
 #line 4428 "LibraryWindow.c"
 	} else {
-#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
 #line 4432 "LibraryWindow.c"
 	}
-#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (view_collection) {
-#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*view_collection = _vala_view_collection;
 #line 4438 "LibraryWindow.c"
 	} else {
-#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
 #line 4442 "LibraryWindow.c"
 	}
-#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 4446 "LibraryWindow.c"
 }
@@ -4467,79 +4467,79 @@ library_window_real_on_fullscreen (AppWindow* base)
 	ViewCollection* _tmp9_;
 	LibraryWindowFullscreenPhotoPage* _tmp10_;
 	LibraryWindowFullscreenPhotoPage* _tmp11_;
-#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	current_page = _tmp0_;
 #line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	current_page = _tmp0_;
+#line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = current_page;
-#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp1_ == NULL) {
 #line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp1_ == NULL) {
+#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (current_page);
-#line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 4485 "LibraryWindow.c"
 	}
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	view = NULL;
 #line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	view = NULL;
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = current_page;
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = library_window_get_fullscreen_photo (self, _tmp2_, &_tmp3_, &_tmp4_, &_tmp5_);
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	collection = _tmp3_;
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	start = _tmp4_;
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp5_;
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (!_tmp6_) {
 #line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (!_tmp6_) {
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (start);
-#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (collection);
-#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (current_page);
-#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 4517 "LibraryWindow.c"
 	}
-#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = collection;
-#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = start;
-#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = view;
-#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = library_window_fullscreen_photo_page_new (_tmp7_, _tmp8_, _tmp9_);
-#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp10_);
-#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	fs_photo = _tmp10_;
-#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = fs_photo;
-#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_go_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE, Page));
-#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (fs_photo);
-#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
 #line 4545 "LibraryWindow.c"
 }
@@ -4548,7 +4548,7 @@ library_window_real_on_fullscreen (AppWindow* base)
 static void
 _g_free0_ (gpointer var)
 {
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	var = (g_free (var), NULL);
 #line 4554 "LibraryWindow.c"
 }
@@ -4557,7 +4557,7 @@ _g_free0_ (gpointer var)
 static inline void
 _g_slist_free__g_free0_ (GSList* self)
 {
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_slist_free_full (self, (GDestroyNotify) _g_free0_);
 #line 4563 "LibraryWindow.c"
 }
@@ -4587,53 +4587,53 @@ library_window_on_file_import (LibraryWindow* self)
 	gboolean _tmp31_;
 	gboolean _tmp32_;
 	GtkFileChooserDialog* _tmp33_;
-#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 509 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_ ("Import From Folder"), NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
-#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_dialog = _tmp0_;
-#line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = import_dialog;
-#line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_file_chooser_get_type (), GtkFileChooser), FALSE);
 #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_file_chooser_get_type (), GtkFileChooser), FALSE);
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = import_dialog;
-#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_file_chooser_get_type (), GtkFileChooser), TRUE);
 #line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_file_chooser_get_type (), GtkFileChooser), TRUE);
+#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = import_dialog;
-#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->import_dir;
-#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp4_);
-#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = (GtkCheckButton*) gtk_check_button_new_with_label (_ ("Recurse Into Subfolders"));
-#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp5_);
-#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	recursive = _tmp5_;
 #line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	recursive = _tmp5_;
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = recursive;
-#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = self->priv->import_recursive;
-#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp7_);
 #line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp7_);
+#line 518 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = import_dialog;
-#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = recursive;
-#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_file_chooser_set_extra_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_file_chooser_get_type (), GtkFileChooser), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = import_dialog;
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog));
-#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = response;
-#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_ == ((gint) GTK_RESPONSE_OK)) {
 #line 4639 "LibraryWindow.c"
 		GtkFileChooserDialog* _tmp12_;
@@ -4646,41 +4646,41 @@ library_window_on_file_import (LibraryWindow* self)
 		gboolean _tmp19_;
 		GtkResponseType copy_files_response = 0;
 		GtkResponseType _tmp20_;
-#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = import_dialog;
-#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = import_dialog;
-#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_file_chooser_get_type (), GtkFileChooser));
-#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = g_file_new_for_uri (_tmp16_);
-#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = _tmp17_;
-#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = app_dirs_is_in_import_dir (_tmp18_);
-#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp18_);
-#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp16_);
-#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp19_) {
 #line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp19_) {
+#line 527 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = GTK_RESPONSE_REJECT;
 #line 4674 "LibraryWindow.c"
 		} else {
-#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = copy_files_dialog ();
 #line 4678 "LibraryWindow.c"
 		}
-#line 524 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		copy_files_response = _tmp13_;
-#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = copy_files_response;
-#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp20_ != GTK_RESPONSE_CANCEL) {
 #line 4686 "LibraryWindow.c"
 			GtkFileChooserDialog* _tmp21_;
@@ -4690,50 +4690,50 @@ library_window_on_file_import (LibraryWindow* self)
 			GtkCheckButton* _tmp25_;
 			gboolean _tmp26_;
 			gboolean _tmp27_;
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = import_dialog;
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_file_chooser_get_type (), GtkFileChooser));
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp23_ = _tmp22_;
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp24_ = copy_files_response;
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp25_ = recursive;
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp26_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp27_ = _tmp26_;
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			library_window_dispatch_import_jobs (self, _tmp23_, "folders", _tmp24_ == GTK_RESPONSE_ACCEPT, _tmp27_);
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			__g_slist_free__g_free0_0 (_tmp23_);
 #line 4712 "LibraryWindow.c"
 		}
 	}
-#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = import_dialog;
-#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_file_chooser_get_type (), GtkFileChooser));
-#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (self->priv->import_dir);
-#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->import_dir = _tmp29_;
 #line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->import_dir = _tmp29_;
+#line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = recursive;
-#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = _tmp31_;
-#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->import_recursive = _tmp32_;
 #line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->import_recursive = _tmp32_;
+#line 537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = import_dialog;
-#line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
-#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (recursive);
-#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
 #line 4739 "LibraryWindow.c"
 }
@@ -4744,15 +4744,15 @@ library_window_on_external_library_import (LibraryWindow* self)
 {
 	GtkDialog* import_dialog = NULL;
 	DataImportsUIDataImportsDialog* _tmp0_;
-#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 540 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = data_imports_ui_data_imports_dialog_get_or_create_instance ();
-#line 540 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_dialog = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_dialog_get_type (), GtkDialog);
-#line 542 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 543 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_dialog_run (import_dialog);
-#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 540 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
 #line 4758 "LibraryWindow.c"
 }
@@ -4765,19 +4765,19 @@ library_window_real_update_common_action_availability (AppWindow* base,
 {
 	LibraryWindow * self;
 	gboolean is_checkerboard = FALSE;
-#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
 #line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
+#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	APP_WINDOW_CLASS (library_window_parent_class)->update_common_action_availability (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), old_page, new_page);
-#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (new_page, TYPE_CHECKERBOARD_PAGE);
-#line 550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar", is_checkerboard);
 #line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar", is_checkerboard);
+#line 552 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFind", is_checkerboard);
 #line 4783 "LibraryWindow.c"
 }
@@ -4796,35 +4796,35 @@ library_window_real_update_common_actions (AppWindow* base,
 	CollectionPage* _tmp0_ = NULL;
 	Photo* _tmp1_ = NULL;
 	gboolean _tmp2_;
-#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 561 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = library_window_get_fullscreen_photo (self, page, &_tmp0_, &_tmp1_, NULL);
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 561 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 561 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	collection = _tmp0_;
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 561 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 561 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	start = _tmp1_;
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 561 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	can_fullscreen = _tmp2_;
-#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", library_window_can_empty_trash (self));
 #line 563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	app_window_set_common_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", TRUE);
+	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", library_window_can_empty_trash (self));
 #line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", library_window_can_jump_to_event (self));
+	app_window_set_common_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", TRUE);
 #line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", library_window_can_jump_to_event (self));
+#line 566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFullscreen", can_fullscreen);
-#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	APP_WINDOW_CLASS (library_window_parent_class)->update_common_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), page, selected_count, count);
-#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
 #line 4830 "LibraryWindow.c"
 }
@@ -4833,9 +4833,9 @@ library_window_real_update_common_actions (AppWindow* base,
 static void
 library_window_on_trashcan_contents_altered (LibraryWindow* self)
 {
-#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", library_window_can_empty_trash (self));
 #line 4841 "LibraryWindow.c"
 }
@@ -4847,26 +4847,26 @@ library_window_can_empty_trash (LibraryWindow* self)
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	LibraryPhotoSourceCollection* _tmp1_;
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
+#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_photo_global;
-#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)) > 0) {
-#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = TRUE;
 #line 4859 "LibraryWindow.c"
 	} else {
 		VideoSourceCollection* _tmp2_;
-#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = video_global;
-#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)) > 0;
 #line 4866 "LibraryWindow.c"
 	}
-#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 4872 "LibraryWindow.c"
 }
@@ -4885,43 +4885,43 @@ library_window_on_empty_trash (LibraryWindow* self)
 	GeeCollection* _tmp6_;
 	CommandManager* _tmp7_;
 	CommandManager* _tmp8_;
-#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	to_remove = _tmp0_;
 #line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	to_remove = _tmp0_;
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_photo_global;
-#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = media_source_collection_get_trashcan_contents (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_array_list_add_all (to_remove, _tmp3_);
-#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp3_);
 #line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp3_);
+#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = video_global;
-#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = media_source_collection_get_trashcan_contents (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_array_list_add_all (to_remove, _tmp6_);
-#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp6_);
-#line 583 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (to_remove, GEE_TYPE_COLLECTION, GeeCollection), _ ("Empty Trash"), _ ("Emptying Trash…"));
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = app_window_get_command_manager ();
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	command_manager_reset (_tmp8_);
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (to_remove);
 #line 4927 "LibraryWindow.c"
 }
@@ -4932,17 +4932,17 @@ library_window_on_new_search (LibraryWindow* self)
 {
 	SavedSearchDialog* _tmp0_;
 	SavedSearchDialog* _tmp1_;
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = saved_search_dialog_new ();
-#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	saved_search_dialog_show (_tmp1_);
-#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
 #line 4948 "LibraryWindow.c"
 }
@@ -4958,53 +4958,53 @@ library_window_can_jump_to_event (LibraryWindow* self)
 	ViewCollection* _tmp2_;
 	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	view = _tmp3_;
 #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	view = _tmp3_;
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view;
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (view_collection_get_selected_count (_tmp4_) == 1) {
 #line 4980 "LibraryWindow.c"
 		DataSource* selected_source = NULL;
 		ViewCollection* _tmp5_;
 		DataSource* _tmp6_;
 		DataSource* _tmp7_;
-#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = view;
-#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = view_collection_get_selected_source_at (_tmp5_, 0);
-#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		selected_source = _tmp6_;
 #line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		selected_source = _tmp6_;
+#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = selected_source;
-#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_EVENT)) {
 #line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_EVENT)) {
+#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = TRUE;
-#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (selected_source);
-#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
 #line 5003 "LibraryWindow.c"
 		} else {
 			DataSource* _tmp8_;
-#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp8_ = selected_source;
-#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_MEDIA_SOURCE)) {
 #line 5010 "LibraryWindow.c"
 				ViewCollection* _tmp9_;
@@ -5013,56 +5013,56 @@ library_window_can_jump_to_event (LibraryWindow* self)
 				Event* _tmp12_;
 				Event* _tmp13_;
 				gboolean _tmp14_;
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp9_ = view;
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp10_ = view_collection_get_selected_source_at (_tmp9_, 0);
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp12_ = media_source_get_event (_tmp11_);
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp13_ = _tmp12_;
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp14_ = _tmp13_ != NULL;
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_tmp13_);
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_tmp11_);
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = _tmp14_;
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (selected_source);
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (view);
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
 #line 5041 "LibraryWindow.c"
 			} else {
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = FALSE;
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (selected_source);
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (view);
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
 #line 5051 "LibraryWindow.c"
 			}
 		}
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (selected_source);
 #line 5056 "LibraryWindow.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = FALSE;
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
 #line 5064 "LibraryWindow.c"
 	}
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
 #line 5068 "LibraryWindow.c"
 }
@@ -5086,87 +5086,87 @@ library_window_on_jump_to_event (LibraryWindow* self)
 	Event* _tmp10_;
 	Event* _tmp11_;
 	gboolean _tmp12_;
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp3_;
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view;
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (view_collection_get_selected_count (_tmp4_) != 1) {
 #line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (view_collection_get_selected_count (_tmp4_) != 1) {
+#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 5112 "LibraryWindow.c"
 	}
-#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = view;
-#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = view_collection_get_selected_source_at (_tmp5_, 0);
-#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp6_) : NULL;
-#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp7_ == NULL) {
-#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
 #line 5124 "LibraryWindow.c"
 	}
-#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	media = _tmp7_;
 #line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	media = _tmp7_;
+#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = media;
-#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp8_ == NULL) {
 #line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp8_ == NULL) {
+#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (media);
-#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 5138 "LibraryWindow.c"
 	}
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = media;
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = media_source_get_event (_tmp9_);
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = _tmp11_ != NULL;
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_) {
 #line 5152 "LibraryWindow.c"
 		MediaSource* _tmp13_;
 		Event* _tmp14_;
 		Event* _tmp15_;
-#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = media;
-#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = media_source_get_event (_tmp13_);
-#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = _tmp14_;
-#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_event (self, _tmp15_);
-#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp15_);
 #line 5166 "LibraryWindow.c"
 	}
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (media);
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
 #line 5172 "LibraryWindow.c"
 }
@@ -5175,7 +5175,7 @@ library_window_on_jump_to_event (LibraryWindow* self)
 static GVariant*
 _variant_new5 (gboolean value)
 {
-#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 624 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 5181 "LibraryWindow.c"
 }
@@ -5189,25 +5189,25 @@ library_window_on_find (LibraryWindow* self)
 	GAction* _tmp1_;
 	GVariant* _tmp2_;
 	SearchFilterToolbar* _tmp3_;
-#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
-#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	action = _tmp1_;
 #line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	action = _tmp1_;
+#line 624 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _variant_new5 (TRUE);
-#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 624 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (action, _tmp2_);
-#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 624 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->search_toolbar;
-#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_toolbar_take_focus (_tmp3_);
-#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
 #line 5213 "LibraryWindow.c"
 }
@@ -5216,9 +5216,9 @@ library_window_on_find (LibraryWindow* self)
 static void
 library_window_on_media_altered (LibraryWindow* self)
 {
-#line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", library_window_can_jump_to_event (self));
 #line 5224 "LibraryWindow.c"
 }
@@ -5228,17 +5228,17 @@ static void
 library_window_on_clear_search (LibraryWindow* self)
 {
 	gboolean _tmp0_;
-#line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->is_search_toolbar_visible;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
 #line 5238 "LibraryWindow.c"
 		SearchFilterActions* _tmp1_;
-#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->search_actions;
-#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp1_);
 #line 5244 "LibraryWindow.c"
 	}
@@ -5254,17 +5254,17 @@ library_window_get_events_sort (LibraryWindow* self)
 	GSimpleAction* _tmp1_;
 	gint _tmp2_ = 0;
 	GSimpleAction* _tmp3_;
-#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
 #line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
+#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents");
-#line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL);
-#line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = action;
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
 #line 5270 "LibraryWindow.c"
 		gint _tmp4_ = 0;
@@ -5274,43 +5274,43 @@ library_window_get_events_sort (LibraryWindow* self)
 		GVariant* _tmp8_;
 		const gchar* _tmp9_;
 		gboolean _tmp10_;
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = action;
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_action_get_type (), GAction));
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = g_variant_get_string (_tmp8_, NULL);
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = g_strcmp0 (_tmp9_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0;
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_variant_unref0 (_tmp8_);
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp10_) {
 #line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp10_) {
+#line 643 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 0;
 #line 5296 "LibraryWindow.c"
 		} else {
-#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 643 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 1;
 #line 5300 "LibraryWindow.c"
 		}
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp4_;
 #line 5304 "LibraryWindow.c"
 	} else {
-#line 643 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = 1;
 #line 5308 "LibraryWindow.c"
 	}
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 5316 "LibraryWindow.c"
 }
@@ -5324,21 +5324,21 @@ library_window_on_events_sort_changed (LibraryWindow* self,
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
 	const gchar* _tmp2_;
-#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = g_variant_get_string (value, NULL);
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), g_strcmp0 (_tmp2_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0);
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (action, value);
 #line 5344 "LibraryWindow.c"
 }
@@ -5347,9 +5347,9 @@ library_window_on_events_sort_changed (LibraryWindow* self,
 static void
 library_window_on_preferences (LibraryWindow* self)
 {
-#line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	preferences_dialog_show_preferences ();
 #line 5355 "LibraryWindow.c"
 }
@@ -5365,65 +5365,65 @@ library_window_on_display_basic_properties (LibraryWindow* self,
 	ConfigFacade* _tmp8_;
 	ConfigFacade* _tmp9_;
 	gboolean _tmp10_;
-#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 660 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	display = g_variant_get_boolean (value);
-#line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = display;
-#line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
 #line 5379 "LibraryWindow.c"
 		BasicProperties* _tmp1_;
 		Page* _tmp2_;
 		Page* _tmp3_;
 		GtkFrame* _tmp4_;
-#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->basic_properties;
-#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = _tmp2_;
-#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PROPERTIES, Properties), _tmp3_);
-#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp3_);
 #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_g_object_unref0 (_tmp3_);
+#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->bottom_frame;
-#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
 #line 5398 "LibraryWindow.c"
 	} else {
 		GtkPaned* _tmp5_;
 		GtkWidget* _tmp6_;
-#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = self->priv->sidebar_paned;
-#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = gtk_paned_get_child2 (_tmp5_);
-#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp6_ != NULL) {
 #line 5408 "LibraryWindow.c"
 			GtkFrame* _tmp7_;
-#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp7_ = self->priv->bottom_frame;
-#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
 #line 5414 "LibraryWindow.c"
 		}
 	}
-#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = display;
-#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
-#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp9_);
 #line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp9_);
+#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (action, value);
 #line 5429 "LibraryWindow.c"
 }
@@ -5432,7 +5432,7 @@ library_window_on_display_basic_properties (LibraryWindow* self,
 static gboolean
 _variant_get6 (GVariant* value)
 {
-#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_get_boolean (value);
 #line 5438 "LibraryWindow.c"
 }
@@ -5441,7 +5441,7 @@ _variant_get6 (GVariant* value)
 static GVariant*
 _variant_new7 (gboolean value)
 {
-#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 5447 "LibraryWindow.c"
 }
@@ -5458,27 +5458,27 @@ library_window_on_action_toggle (LibraryWindow* self,
 	gboolean _tmp2_;
 	GVariant* _tmp3_;
 	GVariant* _tmp4_;
-#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (G_IS_ACTION (action));
 #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_ACTION (action));
+#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_action_get_state (action);
-#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _variant_get6 (_tmp1_);
-#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _variant_new7 (!_tmp2_);
-#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp1_);
-#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	new_state = _tmp4_;
 #line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	new_state = _tmp4_;
+#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (action, new_state);
-#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (new_state);
 #line 5484 "LibraryWindow.c"
 }
@@ -5489,11 +5489,11 @@ library_window_on_action_radio (LibraryWindow* self,
                                 GAction* action,
                                 GVariant* value)
 {
-#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (G_IS_ACTION (action));
 #line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_ACTION (action));
+#line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (action, value);
 #line 5499 "LibraryWindow.c"
 }
@@ -5506,45 +5506,45 @@ library_window_on_display_extended_properties (LibraryWindow* self,
 {
 	gboolean display = FALSE;
 	gboolean _tmp0_;
-#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 686 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	display = g_variant_get_boolean (value);
-#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = display;
-#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
 #line 5520 "LibraryWindow.c"
 		ExtendedPropertiesWindow* _tmp1_;
 		Page* _tmp2_;
 		Page* _tmp3_;
 		ExtendedPropertiesWindow* _tmp4_;
-#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->extended_properties;
-#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = _tmp2_;
-#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		extended_properties_window_update_properties (_tmp1_, _tmp3_);
-#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp3_);
 #line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_g_object_unref0 (_tmp3_);
+#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->extended_properties;
-#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
 #line 5539 "LibraryWindow.c"
 	} else {
 		ExtendedPropertiesWindow* _tmp5_;
-#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = self->priv->extended_properties;
-#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
 #line 5546 "LibraryWindow.c"
 	}
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (action, value);
 #line 5550 "LibraryWindow.c"
 }
@@ -5553,7 +5553,7 @@ library_window_on_display_extended_properties (LibraryWindow* self,
 static GVariant*
 _variant_new8 (gboolean value)
 {
-#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 5559 "LibraryWindow.c"
 }
@@ -5568,27 +5568,27 @@ library_window_on_display_searchbar (LibraryWindow* self,
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
 	GVariant* _tmp2_;
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	is_shown = g_variant_get_boolean (value);
-#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), is_shown);
-#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp1_);
 #line 701 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_show_search_bar (self, is_shown);
+	_g_object_unref0 (_tmp1_);
 #line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_show_search_bar (self, is_shown);
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _variant_new8 (is_shown);
-#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (action, _tmp2_);
-#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp2_);
 #line 5594 "LibraryWindow.c"
 }
@@ -5604,47 +5604,47 @@ library_window_show_search_bar (LibraryWindow* self,
 	Page* _tmp3_;
 	CheckerboardPage* _tmp4_;
 	CheckerboardPage* _tmp5_;
-#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_CHECKERBOARD_PAGE);
-#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp2_) {
 #line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp2_) {
+#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 5622 "LibraryWindow.c"
 	}
-#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->is_search_toolbar_visible = display;
 #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->is_search_toolbar_visible = display;
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp3_) : NULL;
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_ == NULL) {
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp3_);
 #line 5634 "LibraryWindow.c"
 	}
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_toggle_search_bar (self, library_window_should_show_search_bar (self), _tmp5_);
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp5_);
 #line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp5_);
+#line 712 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!display) {
 #line 5644 "LibraryWindow.c"
 		SearchFilterActions* _tmp6_;
-#line 712 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = self->priv->search_actions;
-#line 712 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp6_);
 #line 5650 "LibraryWindow.c"
 	}
@@ -5656,13 +5656,13 @@ library_window_on_display_sidebar (LibraryWindow* self,
                                    GSimpleAction* action,
                                    GVariant* variant)
 {
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 717 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_sidebar_visible (self, g_variant_get_boolean (variant));
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (action, variant);
 #line 5668 "LibraryWindow.c"
 }
@@ -5675,19 +5675,19 @@ library_window_set_sidebar_visible (LibraryWindow* self,
 	GtkPaned* _tmp0_;
 	ConfigFacade* _tmp1_;
 	ConfigFacade* _tmp2_;
-#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->sidebar_paned;
-#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), visible);
 #line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), visible);
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = config_facade_get_instance ();
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), visible);
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
 #line 5693 "LibraryWindow.c"
 }
@@ -5700,19 +5700,19 @@ library_window_is_sidebar_visible (LibraryWindow* self)
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
-#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
+#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = configuration_facade_get_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
-#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 5718 "LibraryWindow.c"
 }
@@ -5723,13 +5723,13 @@ library_window_on_display_toolbar (LibraryWindow* self,
                                    GSimpleAction* action,
                                    GVariant* variant)
 {
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_toolbar_visible (self, g_variant_get_boolean (variant));
-#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (action, variant);
 #line 5735 "LibraryWindow.c"
 }
@@ -5750,55 +5750,55 @@ library_window_set_toolbar_visible (LibraryWindow* self,
 	GtkToolbar* _tmp7_;
 	ConfigFacade* _tmp9_;
 	ConfigFacade* _tmp10_;
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_ == NULL;
-#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp2_) {
 #line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp2_) {
+#line 739 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 5768 "LibraryWindow.c"
 	}
-#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_get_toolbar (_tmp4_);
-#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	toolbar = _tmp6_;
 #line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	toolbar = _tmp6_;
+#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = toolbar;
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp7_ != NULL) {
 #line 5786 "LibraryWindow.c"
 		GtkRevealer* _tmp8_;
-#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->toolbar_revealer;
-#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_revealer_set_reveal_child (_tmp8_, visible);
 #line 5792 "LibraryWindow.c"
 	}
-#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = config_facade_get_instance ();
-#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), visible);
-#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp10_);
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
 #line 5804 "LibraryWindow.c"
 }
@@ -5811,19 +5811,19 @@ library_window_is_toolbar_visible (LibraryWindow* self)
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
-#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
+#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = configuration_facade_get_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 5829 "LibraryWindow.c"
 }
@@ -5832,9 +5832,9 @@ library_window_is_toolbar_visible (LibraryWindow* self)
 static void
 library_window_show_extended_properties (LibraryWindow* self)
 {
-#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, TRUE);
 #line 5840 "LibraryWindow.c"
 }
@@ -5843,9 +5843,9 @@ library_window_show_extended_properties (LibraryWindow* self)
 static void
 library_window_hide_extended_properties (LibraryWindow* self)
 {
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, FALSE);
 #line 5851 "LibraryWindow.c"
 }
@@ -5854,7 +5854,7 @@ library_window_hide_extended_properties (LibraryWindow* self)
 static GVariant*
 _variant_new9 (gboolean value)
 {
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 5860 "LibraryWindow.c"
 }
@@ -5870,29 +5870,29 @@ library_window_sync_extended_properties (LibraryWindow* self,
 	GVariant* _tmp2_;
 	ConfigFacade* _tmp3_;
 	ConfigFacade* _tmp4_;
-#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties");
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	action = _tmp1_;
 #line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	action = _tmp1_;
+#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _variant_new9 (show);
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (action, _tmp2_);
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = config_facade_get_instance ();
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), show);
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
 #line 5898 "LibraryWindow.c"
 }
@@ -5906,17 +5906,17 @@ library_window_enqueue_batch_import (LibraryWindow* self,
 	LibraryBranch* _tmp0_;
 	LibraryImportQueueSidebarEntry* _tmp1_;
 	LibraryImportQueueSidebarEntry* _tmp2_;
-#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_BATCH_IMPORT (batch_import));
 #line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_BATCH_IMPORT (batch_import));
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_import_queue_entry (_tmp0_);
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, batch_import, allow_user_cancel);
 #line 5922 "LibraryWindow.c"
 }
@@ -5926,11 +5926,11 @@ static void
 library_window_import_reporter (LibraryWindow* self,
                                 ImportManifest* manifest)
 {
-#line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
 #line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
+#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_ui_report_manifest (manifest, TRUE, NULL);
 #line 5936 "LibraryWindow.c"
 }
@@ -5941,7 +5941,7 @@ _library_window_import_reporter_batch_import_import_reporter (ImportManifest* ma
                                                               BatchImportRoll* import_roll,
                                                               gpointer self)
 {
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_import_reporter ((LibraryWindow*) self, manifest);
 #line 5947 "LibraryWindow.c"
 }
@@ -5966,41 +5966,41 @@ library_window_dispatch_import_jobs (LibraryWindow* self,
 	GeeArrayList* _tmp26_;
 	gint _tmp27_;
 	gint _tmp28_;
-#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (job_name != NULL);
 #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (job_name != NULL);
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = app_dirs_get_import_dir ();
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = g_get_home_dir ();
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = g_strcmp0 (_tmp4_, _tmp5_) == 0;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_) {
 #line 5992 "LibraryWindow.c"
 		gboolean _tmp7_;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->notify_library_is_home_dir;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp7_;
 #line 5998 "LibraryWindow.c"
 	} else {
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
 #line 6002 "LibraryWindow.c"
 	}
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
 #line 6006 "LibraryWindow.c"
 		GtkResponseType response = 0;
@@ -6010,53 +6010,53 @@ library_window_dispatch_import_jobs (LibraryWindow* self,
 		AppWindow* _tmp11_;
 		GtkResponseType _tmp12_;
 		GtkResponseType _tmp13_;
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = g_strdup_printf (_ ("Shotwell is configured to import photos to your home directory.\n" "We recommend changing this in <span weight=\"bold\">Edit %s Preference" \
 "s</span>.\n" "Do you want to continue importing photos?"), "▸");
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = app_window_get_instance ();
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = app_window_affirm_cancel_question (_tmp9_, _ ("_Import"), _ ("Library Location"), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow));
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp9_);
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		response = _tmp12_;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = response;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp13_ == GTK_RESPONSE_CANCEL) {
 #line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp13_ == GTK_RESPONSE_CANCEL) {
+#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return;
 #line 6036 "LibraryWindow.c"
 		}
-#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->notify_library_is_home_dir = FALSE;
 #line 6040 "LibraryWindow.c"
 	}
-#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
-#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	jobs = _tmp14_;
 #line 6046 "LibraryWindow.c"
 	{
 		GSList* uri_collection = NULL;
 		GSList* uri_it = NULL;
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection = uris;
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
 #line 6054 "LibraryWindow.c"
 			gchar* _tmp15_;
 			gchar* uri = NULL;
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp15_ = g_strdup ((const gchar*) uri_it->data);
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri = _tmp15_;
 #line 6061 "LibraryWindow.c"
 			{
@@ -6071,84 +6071,84 @@ library_window_dispatch_import_jobs (LibraryWindow* self,
 				GFile* _tmp23_;
 				FileImportJob* _tmp24_;
 				FileImportJob* _tmp25_;
-#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp16_ = uri;
-#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp17_ = g_file_new_for_uri (_tmp16_);
-#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				file_or_dir = _tmp17_;
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				file_or_dir = _tmp17_;
+#line 794 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = file_or_dir;
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 794 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = g_file_get_path (_tmp18_);
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 794 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp20_ = _tmp19_;
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 794 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = _tmp20_ == NULL;
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 794 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (_tmp20_);
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 794 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				if (_tmp21_) {
-#line 795 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					app_window_error_message (_ ("Photos cannot be imported from this directory."), NULL);
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_object_unref0 (file_or_dir);
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					continue;
 #line 6100 "LibraryWindow.c"
 				}
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = jobs;
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp23_ = file_or_dir;
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp24_ = file_import_job_new (_tmp23_, copy_to_library, recurse);
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp25_ = _tmp24_;
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_);
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_batch_import_job_unref0 (_tmp25_);
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (file_or_dir);
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
 #line 6118 "LibraryWindow.c"
 			}
 		}
 	}
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = jobs;
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = _tmp27_;
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp28_ > 0) {
 #line 6130 "LibraryWindow.c"
 		BatchImport* batch_import = NULL;
 		GeeArrayList* _tmp29_;
 		BatchImport* _tmp30_;
 		BatchImport* _tmp31_;
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = jobs;
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp30_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ITERABLE, GeeIterable), job_name, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL);
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		batch_import = _tmp30_;
 #line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		batch_import = _tmp30_;
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp31_ = batch_import;
-#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_enqueue_batch_import (self, _tmp31_, TRUE);
 #line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		library_window_enqueue_batch_import (self, _tmp31_, TRUE);
+#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_import_queue_page (self);
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (batch_import);
 #line 6149 "LibraryWindow.c"
 	}
-#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (jobs);
 #line 6153 "LibraryWindow.c"
 }
@@ -6173,155 +6173,155 @@ library_window_get_drag_action (LibraryWindow* self)
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_;
-#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gdk_display_get_default ();
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = gdk_display_get_device_manager (_tmp1_);
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = gdk_device_manager_get_client_pointer (_tmp2_);
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gdk_window_get_device_position (_tmp0_, _tmp3_, NULL, NULL, &_tmp4_);
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mask = _tmp4_;
-#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = mask;
-#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	ctrl = (_tmp5_ & GDK_CONTROL_MASK) != 0;
 #line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	ctrl = (_tmp5_ & GDK_CONTROL_MASK) != 0;
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = mask;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	alt = (_tmp6_ & GDK_MOD1_MASK) != 0;
 #line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	alt = (_tmp6_ & GDK_MOD1_MASK) != 0;
+#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = mask;
-#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	shift = (_tmp7_ & GDK_SHIFT_MASK) != 0;
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = ctrl;
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp10_) {
 #line 6206 "LibraryWindow.c"
 		gboolean _tmp11_;
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = alt;
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = !_tmp11_;
 #line 6212 "LibraryWindow.c"
 	} else {
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = FALSE;
 #line 6216 "LibraryWindow.c"
 	}
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
 #line 6220 "LibraryWindow.c"
 		gboolean _tmp12_;
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = shift;
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = !_tmp12_;
 #line 6226 "LibraryWindow.c"
 	} else {
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = FALSE;
 #line 6230 "LibraryWindow.c"
 	}
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp8_) {
 #line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp8_) {
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = GDK_ACTION_COPY;
-#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
 #line 6238 "LibraryWindow.c"
 	} else {
 		gboolean _tmp13_ = FALSE;
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_;
-#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = ctrl;
-#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp15_) {
 #line 6247 "LibraryWindow.c"
 			gboolean _tmp16_;
-#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = alt;
-#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = _tmp16_;
 #line 6253 "LibraryWindow.c"
 		} else {
-#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = FALSE;
 #line 6257 "LibraryWindow.c"
 		}
-#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_) {
 #line 6261 "LibraryWindow.c"
 			gboolean _tmp17_;
-#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = shift;
-#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = !_tmp17_;
 #line 6267 "LibraryWindow.c"
 		} else {
-#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = FALSE;
 #line 6271 "LibraryWindow.c"
 		}
-#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp13_) {
 #line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp13_) {
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = GDK_ACTION_ASK;
-#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
 #line 6279 "LibraryWindow.c"
 		} else {
 			gboolean _tmp18_ = FALSE;
 			gboolean _tmp19_ = FALSE;
 			gboolean _tmp20_;
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = ctrl;
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp20_) {
 #line 6288 "LibraryWindow.c"
 				gboolean _tmp21_;
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = alt;
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = !_tmp21_;
 #line 6294 "LibraryWindow.c"
 			} else {
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = FALSE;
 #line 6298 "LibraryWindow.c"
 			}
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp19_) {
 #line 6302 "LibraryWindow.c"
 				gboolean _tmp22_;
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = shift;
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = _tmp22_;
 #line 6308 "LibraryWindow.c"
 			} else {
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = FALSE;
 #line 6312 "LibraryWindow.c"
 			}
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			if (_tmp18_) {
 #line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			if (_tmp18_) {
+#line 826 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_LINK;
-#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 826 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
 #line 6320 "LibraryWindow.c"
 			} else {
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_DEFAULT;
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
 #line 6326 "LibraryWindow.c"
 			}
@@ -6347,59 +6347,59 @@ library_window_real_drag_motion (GtkWidget* base,
 	GdkDragAction drag_action = 0;
 	GdkDragAction _tmp4_;
 	GdkDragAction _tmp5_;
-#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
 #line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
+#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gtk_drag_dest_get_target_list (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	target = gtk_drag_dest_find_target (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), context, _tmp0_);
 #line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	target = gtk_drag_dest_find_target (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), context, _tmp0_);
+#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = target;
-#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = GDK_NONE;
-#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp1_ == _tmp2_) {
 #line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:833: drag target is GDK_NONE");
+	if (_tmp1_ == _tmp2_) {
 #line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:834: drag target is GDK_NONE");
+#line 835 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gdk_drag_status (context, 0, (guint32) time);
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
 #line 6372 "LibraryWindow.c"
 	}
-#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = gtk_drag_get_source_widget (context);
-#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_ != NULL) {
 #line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp3_ != NULL) {
+#line 842 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gdk_drag_status (context, GDK_ACTION_PRIVATE, (guint32) time);
-#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
 #line 6384 "LibraryWindow.c"
 	}
-#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	drag_action = library_window_get_drag_action (self);
-#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = drag_action;
-#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp4_ == GDK_ACTION_DEFAULT) {
 #line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp4_ == GDK_ACTION_DEFAULT) {
+#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		drag_action = GDK_ACTION_ASK;
 #line 6394 "LibraryWindow.c"
 	}
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = drag_action;
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gdk_drag_status (context, _tmp5_, (guint32) time);
-#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 855 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = TRUE;
-#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 855 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 6404 "LibraryWindow.c"
 }
@@ -6417,29 +6417,29 @@ library_window_real_drag_data_received (GtkWidget* base,
 	LibraryWindow * self;
 	guint8* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gtk_selection_data_get_data (selection_data);
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (-1 < 0) {
 #line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:860: failed to retrieve SelectionData");
+	if (-1 < 0) {
+#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:861: failed to retrieve SelectionData");
 #line 6432 "LibraryWindow.c"
 	}
-#line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gtk_drag_get_source_widget (context);
-#line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp1_ == NULL) {
 #line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp1_ == NULL) {
+#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_external_drop_handler (self, context, NULL, selection_data, info, time);
 #line 6440 "LibraryWindow.c"
 	} else {
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_drag_finish (context, FALSE, FALSE, (guint32) time);
 #line 6444 "LibraryWindow.c"
 	}
@@ -6466,27 +6466,27 @@ library_window_external_drop_handler (LibraryWindow* self,
 	GdkDragAction _tmp6_;
 	GSList* _tmp14_;
 	GdkDragAction _tmp15_;
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((entry == NULL) || SIDEBAR_IS_ENTRY (entry));
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (data != NULL);
-#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_ = gtk_selection_data_get_uris (data);
-#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = _tmp1_;
-#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array_length1 = _vala_array_length (_tmp0_);
-#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_uris_array_size_ = uris_array_length1;
-#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	uris = NULL;
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	uris = NULL;
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = uris_array;
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2__length1 = uris_array_length1;
 #line 6491 "LibraryWindow.c"
 	{
@@ -6494,63 +6494,63 @@ library_window_external_drop_handler (LibraryWindow* self,
 		gint uri_collection_length1 = 0;
 		gint _uri_collection_size_ = 0;
 		gint uri_it = 0;
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection = _tmp2_;
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection_length1 = _tmp2__length1;
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = 0; uri_it < _tmp2__length1; uri_it = uri_it + 1) {
 #line 6503 "LibraryWindow.c"
 			gchar* _tmp3_;
 			gchar* uri = NULL;
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp3_ = g_strdup (uri_collection[uri_it]);
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri = _tmp3_;
 #line 6510 "LibraryWindow.c"
 			{
 				const gchar* _tmp4_;
 				gchar* _tmp5_;
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp4_ = uri;
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp5_ = g_strdup (_tmp4_);
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uris = g_slist_append (uris, _tmp5_);
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
 #line 6522 "LibraryWindow.c"
 			}
 		}
 	}
-#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	selected_action = gdk_drag_context_get_selected_action (context);
 #line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	selected_action = gdk_drag_context_get_selected_action (context);
+#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = selected_action;
-#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ == GDK_ACTION_ASK) {
 #line 6532 "LibraryWindow.c"
 		GtkResponseType _result_ = 0;
 		GSList* _tmp7_;
 		GtkResponseType _tmp13_;
-#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_result_ = GTK_RESPONSE_REJECT;
 #line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_result_ = GTK_RESPONSE_REJECT;
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = uris;
 #line 6540 "LibraryWindow.c"
 		{
 			GSList* uri_collection = NULL;
 			GSList* uri_it = NULL;
-#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri_collection = _tmp7_;
-#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
 #line 6548 "LibraryWindow.c"
 				gchar* _tmp8_;
 				gchar* uri = NULL;
-#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp8_ = g_strdup ((const gchar*) uri_it->data);
-#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uri = _tmp8_;
 #line 6555 "LibraryWindow.c"
 				{
@@ -6558,81 +6558,81 @@ library_window_external_drop_handler (LibraryWindow* self,
 					GFile* _tmp10_;
 					GFile* _tmp11_;
 					gboolean _tmp12_;
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp9_ = uri;
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp10_ = g_file_new_for_uri (_tmp9_);
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp11_ = _tmp10_;
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp12_ = !app_dirs_is_in_import_dir (_tmp11_);
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_object_unref0 (_tmp11_);
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-					if (_tmp12_) {
 #line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+					if (_tmp12_) {
+#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_result_ = copy_files_dialog ();
-#line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_g_free0 (uri);
-#line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						break;
 #line 6579 "LibraryWindow.c"
 					}
-#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
 #line 6583 "LibraryWindow.c"
 				}
 			}
 		}
-#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = _result_;
-#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		switch (_tmp13_) {
-#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_ACCEPT:
 #line 6593 "LibraryWindow.c"
 			{
-#line 892 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				selected_action = GDK_ACTION_COPY;
 #line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				selected_action = GDK_ACTION_COPY;
+#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
 #line 6599 "LibraryWindow.c"
 			}
-#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_REJECT:
 #line 6603 "LibraryWindow.c"
 			{
-#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				selected_action = GDK_ACTION_LINK;
 #line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				selected_action = GDK_ACTION_LINK;
+#line 898 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
 #line 6609 "LibraryWindow.c"
 			}
 			default:
 			{
-#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				gtk_drag_finish (context, FALSE, FALSE, (guint32) time);
-#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				__g_slist_free__g_free0_0 (uris);
-#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return;
 #line 6621 "LibraryWindow.c"
 			}
 		}
 	}
-#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 908 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = uris;
-#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 908 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = selected_action;
-#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 908 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_dispatch_import_jobs (self, _tmp14_, "drag-and-drop", _tmp15_ == GDK_ACTION_COPY, TRUE);
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_drag_finish (context, TRUE, FALSE, (guint32) time);
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	__g_slist_free__g_free0_0 (uris);
-#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
 #line 6637 "LibraryWindow.c"
 }
@@ -6646,21 +6646,21 @@ library_window_switch_to_library_page (LibraryWindow* self)
 	LibraryPhotosEntry* _tmp2_;
 	Page* _tmp3_;
 	Page* _tmp4_;
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_photos_entry (_tmp0_);
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp4_);
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
 #line 6665 "LibraryWindow.c"
 }
@@ -6674,37 +6674,37 @@ library_window_switch_to_event (LibraryWindow* self,
 	EventsBranch* _tmp0_;
 	EventsEventEntry* _tmp1_;
 	EventsEventEntry* _tmp2_;
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_EVENT (event));
 #line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_EVENT (event));
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->events_branch;
-#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = events_branch_get_entry_for_event (_tmp0_, event);
-#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp1_;
 #line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = _tmp1_;
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = entry;
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
 #line 6691 "LibraryWindow.c"
 		EventsEventEntry* _tmp3_;
 		Page* _tmp4_;
 		Page* _tmp5_;
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 920 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = entry;
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 920 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 920 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 920 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp5_);
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 920 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
 #line 6705 "LibraryWindow.c"
 	}
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
 #line 6709 "LibraryWindow.c"
 }
@@ -6718,37 +6718,37 @@ library_window_switch_to_tag (LibraryWindow* self,
 	TagsBranch* _tmp0_;
 	TagsSidebarEntry* _tmp1_;
 	TagsSidebarEntry* _tmp2_;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_TAG (tag));
 #line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_TAG (tag));
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->tags_branch;
-#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = tags_branch_get_entry_for_tag (_tmp0_, tag);
-#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp1_;
 #line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = _tmp1_;
+#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = entry;
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
 #line 6735 "LibraryWindow.c"
 		TagsSidebarEntry* _tmp3_;
 		Page* _tmp4_;
 		Page* _tmp5_;
-#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = entry;
-#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp5_);
-#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
 #line 6749 "LibraryWindow.c"
 	}
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
 #line 6753 "LibraryWindow.c"
 }
@@ -6762,37 +6762,37 @@ library_window_switch_to_saved_search (LibraryWindow* self,
 	SearchesBranch* _tmp0_;
 	SearchesSidebarEntry* _tmp1_;
 	SearchesSidebarEntry* _tmp2_;
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_SAVED_SEARCH (search));
 #line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_SAVED_SEARCH (search));
+#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->saved_search_branch;
-#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = searches_branch_get_entry_for_saved_search (_tmp0_, search);
-#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp1_;
 #line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = _tmp1_;
+#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = entry;
-#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
 #line 6779 "LibraryWindow.c"
 		SearchesSidebarEntry* _tmp3_;
 		Page* _tmp4_;
 		Page* _tmp5_;
-#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = entry;
-#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp5_);
-#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
 #line 6793 "LibraryWindow.c"
 	}
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
 #line 6797 "LibraryWindow.c"
 }
@@ -6810,56 +6810,56 @@ library_window_switch_to_photo_page (LibraryWindow* self,
 	LibraryPhotoPage* _tmp4_;
 	LibraryPhotoPage* _tmp7_;
 	LibraryPhotoPage* _tmp8_;
-#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (controller));
-#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_PHOTO (current));
 #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_PHOTO (current));
+#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (controller, TYPE_PAGE, Page));
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = view_collection_get_view_for_source (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (current, TYPE_DATA_SOURCE, DataSource));
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp3_ != NULL, "controller.get_view().get_view_for_source(current) != null");
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_data_collection_unref0 (_tmp1_);
 #line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_data_collection_unref0 (_tmp1_);
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->photo_page;
-#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_ == NULL) {
 #line 6837 "LibraryWindow.c"
 		LibraryPhotoPage* _tmp5_;
 		LibraryPhotoPage* _tmp6_;
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = library_photo_page_new ();
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_object_ref_sink (_tmp5_);
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (self->priv->photo_page);
-#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		self->priv->photo_page = _tmp5_;
 #line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		self->priv->photo_page = _tmp5_;
+#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = self->priv->photo_page;
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE, Page));
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		spin_event_loop ();
 #line 6854 "LibraryWindow.c"
 	}
-#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = self->priv->photo_page;
-#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_photo_page_display_for_collection (_tmp7_, controller, current, NULL);
 #line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_photo_page_display_for_collection (_tmp7_, controller, current, NULL);
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->photo_page;
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
 #line 6864 "LibraryWindow.c"
 }
@@ -6873,21 +6873,21 @@ library_window_switch_to_import_queue_page (LibraryWindow* self)
 	LibraryImportQueueSidebarEntry* _tmp2_;
 	Page* _tmp3_;
 	Page* _tmp4_;
-#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_import_queue_entry (_tmp0_);
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp4_);
-#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
 #line 6892 "LibraryWindow.c"
 }
@@ -6911,39 +6911,39 @@ library_window_on_camera_added (LibraryWindow* self,
 	gboolean _tmp11_ = FALSE;
 	GMount* _tmp12_;
 	GError * _inner_error_ = NULL;
-#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
 #line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
+#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->camera_branch;
-#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = camera_branch_get_entry_for_camera (_tmp0_, camera);
-#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp1_;
 #line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = _tmp1_;
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = entry;
-#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp2_ == NULL) {
 #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp2_ == NULL) {
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 6932 "LibraryWindow.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_IMPORT_PAGE, ImportPage);
 #line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_IMPORT_PAGE, ImportPage);
+#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = camera->uri;
-#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = g_file_new_for_uri (_tmp5_);
-#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uri_file = _tmp6_;
-#line 962 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
 #line 6948 "LibraryWindow.c"
 	{
@@ -6951,26 +6951,26 @@ library_window_on_camera_added (LibraryWindow* self,
 		GFile* _tmp8_;
 		GMount* _tmp9_;
 		GMount* _tmp10_;
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = uri_file;
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = g_file_find_enclosing_mount (_tmp8_, NULL, &_inner_error_);
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp9_;
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6962 "LibraryWindow.c"
 			goto __catch46_g_error;
 		}
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = _tmp7_;
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = NULL;
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		mount = _tmp10_;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp7_);
 #line 6975 "LibraryWindow.c"
 	}
@@ -6978,87 +6978,87 @@ library_window_on_camera_added (LibraryWindow* self,
 	__catch46_g_error:
 	{
 		GError* err = NULL;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_inner_error_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
 #line 6987 "LibraryWindow.c"
 	}
 	__finally46:
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (page);
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 7006 "LibraryWindow.c"
 	}
-#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = mount;
-#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ != NULL) {
 #line 7012 "LibraryWindow.c"
 		const gchar* _tmp13_;
-#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = camera->uri;
-#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = !g_str_has_prefix (_tmp13_, "file://");
 #line 7018 "LibraryWindow.c"
 	} else {
-#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = FALSE;
 #line 7022 "LibraryWindow.c"
 	}
-#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_) {
 #line 7026 "LibraryWindow.c"
 		ImportPage* _tmp14_;
 		GMount* _tmp15_;
-#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = page;
-#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = mount;
-#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (import_page_unmount_camera (_tmp14_, _tmp15_)) {
 #line 7035 "LibraryWindow.c"
 			ImportPage* _tmp16_;
-#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 973 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = page;
-#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 973 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE, Page));
 #line 7041 "LibraryWindow.c"
 		} else {
-#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 975 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			app_window_error_message ("Unable to unmount the camera at this time.", NULL);
 #line 7045 "LibraryWindow.c"
 		}
 	} else {
 		ImportPage* _tmp17_;
-#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 977 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = page;
-#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 977 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PAGE, Page));
 #line 7053 "LibraryWindow.c"
 	}
-#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
-#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
-#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page);
-#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
 #line 7063 "LibraryWindow.c"
 }
@@ -7070,19 +7070,19 @@ library_window_add_to_stack (LibraryWindow* self,
 {
 	GtkStack* _tmp0_;
 	GtkStack* _tmp1_;
-#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->stack;
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 986 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
-#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->stack;
-#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
 #line 7087 "LibraryWindow.c"
 }
@@ -7094,17 +7094,17 @@ library_window_remove_from_stack (LibraryWindow* self,
 {
 	GtkStack* _tmp0_;
 	GtkStack* _tmp1_;
-#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_PAGE (page));
 #line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_PAGE (page));
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->stack;
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->stack;
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
 #line 7109 "LibraryWindow.c"
 }
@@ -7113,7 +7113,7 @@ library_window_remove_from_stack (LibraryWindow* self,
 static GVariant*
 _variant_new10 (gboolean value)
 {
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 7118 "LibraryWindow.c"
 }
@@ -7122,7 +7122,7 @@ _variant_new10 (gboolean value)
 static GVariant*
 _variant_new11 (gboolean value)
 {
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 7127 "LibraryWindow.c"
 }
@@ -7131,7 +7131,7 @@ _variant_new11 (gboolean value)
 static GVariant*
 _variant_new12 (gboolean value)
 {
-#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
 #line 7136 "LibraryWindow.c"
 }
@@ -7140,7 +7140,7 @@ _variant_new12 (gboolean value)
 static GVariant*
 _variant_new13 (const gchar* value)
 {
-#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1021 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
 #line 7145 "LibraryWindow.c"
 }
@@ -7185,129 +7185,129 @@ library_window_load_configuration (LibraryWindow* self)
 	gchar* _tmp28_;
 	GAction* _tmp29_;
 	GVariant* _tmp30_;
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayBasicProperties");
-#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	basic_display_action = _tmp1_;
 #line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	basic_display_action = _tmp1_;
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = basic_display_action;
-#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (_tmp2_ != NULL, "basic_display_action != null");
 #line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_assert (_tmp2_ != NULL, "basic_display_action != null");
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = basic_display_action;
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _variant_new10 (configuration_facade_get_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp3_, _tmp6_);
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp6_);
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties");
-#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	extended_display_action = _tmp8_;
 #line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	extended_display_action = _tmp8_;
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = extended_display_action;
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (_tmp9_ != NULL, "extended_display_action != null");
 #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_assert (_tmp9_ != NULL, "extended_display_action != null");
+#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = extended_display_action;
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = config_facade_get_instance ();
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = _tmp11_;
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = _variant_new11 (configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp10_, _tmp13_);
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp13_);
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp12_);
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	search_bar_display_action = _tmp15_;
 #line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	search_bar_display_action = _tmp15_;
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = search_bar_display_action;
-#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (_tmp16_ != NULL, "search_bar_display_action != null");
 #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_assert (_tmp16_ != NULL, "search_bar_display_action != null");
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = search_bar_display_action;
-#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = config_facade_get_instance ();
-#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = _tmp18_;
-#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = _variant_new12 (configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
-#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp17_, _tmp20_);
-#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp20_);
-#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp19_);
-#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents");
-#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = _g_object_ref0 (_tmp21_);
-#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sort_events_action = _tmp22_;
 #line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sort_events_action = _tmp22_;
+#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = sort_events_action;
-#line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp23_ != NULL, "sort_events_action != null");
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = config_facade_get_instance ();
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = _tmp25_;
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp27_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp26_);
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp27_) {
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING;
 #line 7284 "LibraryWindow.c"
 	} else {
-#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
 #line 7288 "LibraryWindow.c"
 	}
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = g_strdup (_tmp24_);
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	event_sort_val = _tmp28_;
-#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1021 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = sort_events_action;
-#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1021 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = _variant_new13 (event_sort_val);
-#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1021 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp29_, _tmp30_);
-#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1021 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp30_);
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (event_sort_val);
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (sort_events_action);
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (search_bar_display_action);
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (extended_display_action);
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_display_action);
 #line 7312 "LibraryWindow.c"
 }
@@ -7318,7 +7318,7 @@ _library_window_on_pulse_background_progress_bar_gsource_func (gpointer self)
 {
 	gboolean result;
 	result = library_window_on_pulse_background_progress_bar ((LibraryWindow*) self);
-#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1036 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 7323 "LibraryWindow.c"
 }
@@ -7332,33 +7332,33 @@ library_window_start_pulse_background_progress_bar (LibraryWindow* self,
 	gint _tmp0_;
 	GtkProgressBar* _tmp1_;
 	GtkProgressBar* _tmp2_;
-#line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (label != NULL);
 #line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (label != NULL);
+#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->current_progress_priority;
-#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (priority < _tmp0_) {
 #line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (priority < _tmp0_) {
+#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 7345 "LibraryWindow.c"
 	}
-#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, priority, FALSE);
-#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1030 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = priority;
-#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->background_progress_bar;
-#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_set_text (_tmp1_, label);
 #line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_progress_bar_set_text (_tmp1_, label);
+#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_bar;
-#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_pulse (_tmp2_);
 #line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_progress_bar_pulse (_tmp2_);
+#line 1034 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
-#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1036 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC, _library_window_on_pulse_background_progress_bar_gsource_func, g_object_ref (self), g_object_unref);
 #line 7363 "LibraryWindow.c"
 }
@@ -7369,15 +7369,15 @@ library_window_on_pulse_background_progress_bar (LibraryWindow* self)
 {
 	gboolean result = FALSE;
 	GtkProgressBar* _tmp0_;
-#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
+#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_bar;
-#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_pulse (_tmp0_);
-#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = TRUE;
-#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 7382 "LibraryWindow.c"
 }
@@ -7390,33 +7390,33 @@ library_window_stop_pulse_background_progress_bar (LibraryWindow* self,
 {
 	gint _tmp0_;
 	guint _tmp1_;
-#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->current_progress_priority;
-#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (priority < _tmp0_) {
 #line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (priority < _tmp0_) {
+#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 7401 "LibraryWindow.c"
 	}
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->background_progress_pulse_id;
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp1_ != ((guint) 0)) {
 #line 7407 "LibraryWindow.c"
 		guint _tmp2_;
-#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = self->priv->background_progress_pulse_id;
-#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_source_remove (_tmp2_);
 #line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_source_remove (_tmp2_);
+#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_pulse_id = (guint) 0;
 #line 7415 "LibraryWindow.c"
 	}
-#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (clear) {
 #line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (clear) {
+#line 1056 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, priority);
 #line 7421 "LibraryWindow.c"
 	}
@@ -7440,71 +7440,71 @@ library_window_update_background_progress_bar (LibraryWindow* self,
 	gdouble _tmp6_;
 	gchar* _tmp7_;
 	gchar* _tmp8_;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (label != NULL);
-#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->current_progress_priority;
-#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (priority < _tmp0_) {
 #line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (priority < _tmp0_) {
+#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 7453 "LibraryWindow.c"
 	}
-#line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1064 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, priority, FALSE);
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (count <= 0.0) {
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = TRUE;
 #line 7461 "LibraryWindow.c"
 	} else {
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = total <= 0.0;
 #line 7465 "LibraryWindow.c"
 	}
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = TRUE;
 #line 7471 "LibraryWindow.c"
 	} else {
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = count >= total;
 #line 7475 "LibraryWindow.c"
 	}
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp1_) {
 #line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp1_) {
+#line 1067 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, priority);
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 7483 "LibraryWindow.c"
 	}
-#line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1072 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = priority;
-#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	fraction = count / total;
 #line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	fraction = count / total;
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->background_progress_bar;
-#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = fraction;
-#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_set_fraction (_tmp3_, _tmp4_);
 #line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_progress_bar_set_fraction (_tmp3_, _tmp4_);
+#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->background_progress_bar;
-#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = fraction;
-#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = g_strdup_printf (_ ("%s (%d%%)"), label, (gint) (_tmp6_ * 100.0));
-#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp5_, _tmp8_);
-#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_free0 (_tmp8_);
 #line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_free0 (_tmp8_);
+#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
 #line 7509 "LibraryWindow.c"
 }
@@ -7517,29 +7517,29 @@ library_window_clear_background_progress_bar (LibraryWindow* self,
 	gint _tmp0_;
 	GtkProgressBar* _tmp1_;
 	GtkProgressBar* _tmp2_;
-#line 1085 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->current_progress_priority;
-#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (priority < _tmp0_) {
 #line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (priority < _tmp0_) {
+#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 7528 "LibraryWindow.c"
 	}
-#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1090 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, priority, FALSE);
-#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1092 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = 0;
-#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->background_progress_bar;
-#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_set_fraction (_tmp1_, 0.0);
 #line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_progress_bar_set_fraction (_tmp1_, 0.0);
+#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_bar;
-#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_set_text (_tmp2_, "");
 #line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_progress_bar_set_text (_tmp2_, "");
+#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_background_progress_bar (self);
 #line 7544 "LibraryWindow.c"
 }
@@ -7549,27 +7549,27 @@ static void
 library_window_show_background_progress_bar (LibraryWindow* self)
 {
 	gboolean _tmp0_;
-#line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
-#line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp0_) {
 #line 7558 "LibraryWindow.c"
 		GtkBox* _tmp1_;
 		GtkFrame* _tmp2_;
 		GtkFrame* _tmp3_;
-#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
-#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = self->priv->background_progress_frame;
-#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_box_pack_end (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_box_pack_end (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->background_progress_frame;
-#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
 #line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
+#line 1108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = TRUE;
 #line 7574 "LibraryWindow.c"
 	}
@@ -7580,22 +7580,22 @@ static void
 library_window_hide_background_progress_bar (LibraryWindow* self)
 {
 	gboolean _tmp0_;
-#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
-#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
 #line 7589 "LibraryWindow.c"
 		GtkBox* _tmp1_;
 		GtkFrame* _tmp2_;
-#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
-#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = self->priv->background_progress_frame;
-#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
 #line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
+#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = FALSE;
 #line 7600 "LibraryWindow.c"
 	}
@@ -7605,9 +7605,9 @@ library_window_hide_background_progress_bar (LibraryWindow* self)
 static void
 library_window_on_library_monitor_discovery_started (LibraryWindow* self)
 {
-#line 1118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY);
 #line 7612 "LibraryWindow.c"
 }
@@ -7616,9 +7616,9 @@ library_window_on_library_monitor_discovery_started (LibraryWindow* self)
 static void
 library_window_on_library_monitor_discovery_completed (LibraryWindow* self)
 {
-#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 1124 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY, TRUE);
 #line 7623 "LibraryWindow.c"
 }
@@ -7629,15 +7629,15 @@ library_window_on_library_monitor_auto_update_progress (LibraryWindow* self,
                                                         gint completed_files,
                                                         gint total_files)
 {
-#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (total_files < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) {
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (total_files < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) {
+#line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY);
 #line 7638 "LibraryWindow.c"
 	} else {
-#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_update_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) completed_files, (gdouble) total_files);
 #line 7642 "LibraryWindow.c"
 	}
@@ -7647,9 +7647,9 @@ library_window_on_library_monitor_auto_update_progress (LibraryWindow* self,
 static void
 library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self)
 {
-#line 1135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 1137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _ ("Preparing to auto-import photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY);
 #line 7654 "LibraryWindow.c"
 }
@@ -7660,9 +7660,9 @@ library_window_on_library_monitor_auto_import_progress (LibraryWindow* self,
                                                         guint64 completed_bytes,
                                                         guint64 total_bytes)
 {
-#line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_update_background_progress_bar (self, _ ("Auto-importing photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) completed_bytes, (gdouble) total_bytes);
 #line 7667 "LibraryWindow.c"
 }
@@ -7673,15 +7673,15 @@ library_window_on_metadata_writer_progress (LibraryWindow* self,
                                             guint completed,
                                             guint total)
 {
-#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (total < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) {
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (total < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) {
+#line 1148 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY);
 #line 7682 "LibraryWindow.c"
 	} else {
-#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_update_background_progress_bar (self, _ ("Writing metadata to files…"), LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) completed, (gdouble) total);
 #line 7686 "LibraryWindow.c"
 	}
@@ -7740,185 +7740,185 @@ library_window_create_layout (LibraryWindow* self,
 	GtkBox* _tmp44_;
 	GtkPaned* _tmp45_;
 	GtkBox* _tmp46_;
-#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (start_page));
-#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL);
-#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	scrolled_sidebar = _tmp0_;
 #line 1158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_scrolled_window_set_policy (scrolled_sidebar, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+	scrolled_sidebar = _tmp0_;
 #line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_scrolled_window_set_policy (scrolled_sidebar, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->sidebar_tree;
-#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_frame;
-#line 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), (guint) 2);
 #line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), (guint) 2);
+#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->background_progress_frame;
-#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
 #line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
+#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->background_progress_frame;
-#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_style_context_remove_class (_tmp6_, "frame");
-#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = self->priv->basic_properties;
-#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
 #line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->basic_properties;
-#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->basic_properties;
-#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->basic_properties;
-#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = self->priv->basic_properties;
-#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 10);
 #line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 10);
+#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->basic_properties;
-#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 10);
 #line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 10);
+#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->basic_properties;
-#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 6);
 #line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 6);
+#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = self->priv->basic_properties;
-#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), 0);
-#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->bottom_frame;
-#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->basic_properties;
-#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
 #line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
+#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = self->priv->bottom_frame;
-#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
-#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_style_context_remove_class (_tmp18_, "frame");
-#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = self->priv->top_section;
-#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = self->priv->sidebar_paned;
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = self->priv->top_section;
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_pack1 (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
 #line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_paned_pack1 (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = self->priv->sidebar_paned;
-#line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->bottom_frame;
-#line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_pack2 (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
 #line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_paned_pack2 (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
+#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = self->priv->sidebar_paned;
-#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_set_position (_tmp24_, 1000);
-#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp25_);
-#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->right_vbox);
-#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->right_vbox = _tmp25_;
 #line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->right_vbox = _tmp25_;
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = self->priv->right_vbox;
-#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp27_ = self->priv->search_toolbar;
-#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 1189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = self->priv->right_vbox;
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = self->priv->stack;
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 1189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = self->priv->right_vbox;
-#line 1189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = self->priv->toolbar_revealer;
-#line 1189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
-#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp32_);
-#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->client_paned);
-#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->client_paned = _tmp32_;
 #line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->client_paned = _tmp32_;
+#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = self->priv->client_paned;
-#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = self->priv->sidebar_paned;
-#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_pack1 (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
 #line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_paned_pack1 (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
+#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = self->priv->sidebar_tree;
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH, -1);
 #line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH, -1);
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp36_ = self->priv->client_paned;
-#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = self->priv->right_vbox;
-#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_pack2 (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
 #line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_paned_pack2 (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
+#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp38_ = self->priv->client_paned;
-#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp39_ = config_facade_get_instance ();
-#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = _tmp39_;
-#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_set_position (_tmp38_, configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
-#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp40_);
-#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1198 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = self->priv->stack;
-#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1198 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = library_window_get_PAGE_MIN_WIDTH ();
-#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1198 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = _tmp42_;
-#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1198 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), _tmp43_, -1);
-#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = self->priv->layout;
-#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp45_ = self->priv->client_paned;
-#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_box_pack_end (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp46_ = self->priv->layout;
-#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget));
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_switch_to_page (self, start_page);
 #line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_switch_to_page (self, start_page);
+#line 1205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (start_page, gtk_widget_get_type (), GtkWidget));
-#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (scrolled_sidebar);
 #line 7923 "LibraryWindow.c"
 }
@@ -7929,11 +7929,11 @@ library_window_real_set_current_page (PageWindow* base,
                                       Page* page)
 {
 	LibraryWindow * self;
-#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, page);
 #line 7938 "LibraryWindow.c"
 }
@@ -7943,9 +7943,9 @@ void
 library_window_set_page_switching_enabled (LibraryWindow* self,
                                            gboolean should_enable)
 {
-#line 1212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = should_enable;
 #line 7950 "LibraryWindow.c"
 }
@@ -7982,39 +7982,39 @@ library_window_switch_to_page (LibraryWindow* self,
 	GtkToolbar* toolbar = NULL;
 	GtkToolbar* _tmp40_;
 	GtkToolbar* _tmp41_;
-#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_PAGE (page));
 #line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_PAGE (page));
+#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->page_switching_enabled;
-#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (!_tmp0_) {
 #line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (!_tmp0_) {
+#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 7995 "LibraryWindow.c"
 	}
-#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = page == _tmp2_;
-#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_) {
 #line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp3_) {
+#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 8009 "LibraryWindow.c"
 	}
-#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	current_page = _tmp4_;
 #line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	current_page = _tmp4_;
+#line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = current_page;
-#line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ != NULL) {
 #line 8019 "LibraryWindow.c"
 		GtkToolbar* toolbar = NULL;
@@ -8024,82 +8024,82 @@ library_window_switch_to_page (LibraryWindow* self,
 		Page* _tmp11_;
 		Page* _tmp12_;
 		Page* _tmp14_;
-#line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE);
 #line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE);
+#line 1227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		application_set_menubar (NULL);
-#line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = current_page;
-#line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = page_get_toolbar (_tmp6_);
-#line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		toolbar = _tmp7_;
 #line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		toolbar = _tmp7_;
+#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = toolbar;
-#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp8_ != NULL) {
 #line 8041 "LibraryWindow.c"
 			GtkRevealer* _tmp9_;
 			GtkToolbar* _tmp10_;
-#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = self->priv->toolbar_revealer;
-#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp10_ = toolbar;
-#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
 #line 8050 "LibraryWindow.c"
 		}
-#line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = current_page;
-#line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		page_switching_from (_tmp11_);
-#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = current_page;
-#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_LIBRARY_PHOTO_PAGE)) {
 #line 8060 "LibraryWindow.c"
 			SidebarTree* _tmp13_;
-#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = self->priv->sidebar_tree;
-#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_enable_editing (_tmp13_);
 #line 8066 "LibraryWindow.c"
 		}
-#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = current_page;
-#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_unsubscribe_from_basic_information (self, _tmp14_);
-#line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (toolbar);
 #line 8074 "LibraryWindow.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->stack;
-#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_stack_set_visible_child (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
-#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_WINDOW_CLASS (library_window_parent_class)->set_current_page (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), page);
-#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_LIBRARY_PHOTO_PAGE)) {
 #line 8084 "LibraryWindow.c"
 		SidebarTree* _tmp16_;
-#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = self->priv->sidebar_tree;
-#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_disable_editing (_tmp16_);
 #line 8090 "LibraryWindow.c"
 	}
-#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_toggle_search_bar (self, library_window_should_show_search_bar (self), G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) page) : NULL);
-#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = self->priv->page_map;
-#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page);
-#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = (SidebarEntry*) _tmp18_;
 #line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = (SidebarEntry*) _tmp18_;
+#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = entry;
-#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp19_ != NULL) {
 #line 8104 "LibraryWindow.c"
 		SidebarExpandableEntry* expandable_entry = NULL;
@@ -8109,137 +8109,137 @@ library_window_switch_to_page (LibraryWindow* self,
 		SidebarExpandableEntry* _tmp23_;
 		SidebarTree* _tmp27_;
 		SidebarEntry* _tmp28_;
-#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = entry;
-#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, SIDEBAR_TYPE_EXPANDABLE_ENTRY) ? ((SidebarExpandableEntry*) _tmp20_) : NULL);
-#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		expandable_entry = _tmp21_;
 #line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		expandable_entry = _tmp21_;
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = expandable_entry;
-#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp23_ != NULL) {
 #line 8122 "LibraryWindow.c"
 			SidebarExpandableEntry* _tmp24_;
-#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp24_ = expandable_entry;
-#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = sidebar_expandable_entry_expand_on_select (_tmp24_);
 #line 8128 "LibraryWindow.c"
 		} else {
-#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = FALSE;
 #line 8132 "LibraryWindow.c"
 		}
-#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp22_) {
 #line 8136 "LibraryWindow.c"
 			SidebarTree* _tmp25_;
 			SidebarEntry* _tmp26_;
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp25_ = self->priv->sidebar_tree;
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp26_ = entry;
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_expand_to_entry (_tmp25_, _tmp26_);
 #line 8145 "LibraryWindow.c"
 		}
-#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = self->priv->sidebar_tree;
-#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = entry;
-#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_place_cursor (_tmp27_, _tmp28_, TRUE);
-#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (expandable_entry);
 #line 8155 "LibraryWindow.c"
 	}
-#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties (self);
-#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_CHECKERBOARD_PAGE)) {
 #line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_CHECKERBOARD_PAGE)) {
+#line 1275 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_init_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
 #line 8163 "LibraryWindow.c"
 	}
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
-#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = _tmp29_;
-#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_subscribe_for_basic_information (self, _tmp30_);
-#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp30_);
-#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_switched_to (page);
-#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = page_get_menubar (page);
-#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = _tmp31_;
-#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	application_set_menubar (_tmp32_);
-#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp32_);
 #line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE);
+	_g_object_unref0 (_tmp32_);
 #line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE);
+#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_get (_tmp33_, "gtk-shell-shows-menubar", &_tmp34_, NULL);
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = _tmp34_;
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	old = _tmp35_;
 #line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	old = _tmp35_;
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp36_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = old;
-#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_object_set (_tmp36_, "gtk-shell-shows-menubar", !_tmp37_, NULL);
 #line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_object_set (_tmp36_, "gtk-shell-shows-menubar", !_tmp37_, NULL);
+#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp38_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp39_ = old;
-#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1288 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_set (_tmp38_, "gtk-shell-shows-menubar", _tmp39_, NULL);
-#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = page_get_toolbar (page);
-#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	toolbar = _tmp40_;
 #line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	toolbar = _tmp40_;
+#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = toolbar;
-#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp41_ != NULL) {
 #line 8215 "LibraryWindow.c"
 		GtkRevealer* _tmp42_;
 		GtkToolbar* _tmp43_;
 		GtkToolbar* _tmp44_;
 		GtkRevealer* _tmp45_;
-#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp42_ = self->priv->toolbar_revealer;
-#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp43_ = toolbar;
-#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget));
 #line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget));
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp44_ = toolbar;
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget));
 #line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget));
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp45_ = self->priv->toolbar_revealer;
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_revealer_set_reveal_child (_tmp45_, library_window_is_toolbar_visible (self));
 #line 8234 "LibraryWindow.c"
 	}
-#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_ready (page);
-#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
-#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
 #line 8244 "LibraryWindow.c"
 }
@@ -8256,33 +8256,33 @@ library_window_init_view_filter (LibraryWindow* self,
 	ViewCollection* _tmp4_;
 	SearchViewFilter* _tmp5_;
 	SearchViewFilter* _tmp6_;
-#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_CHECKERBOARD_PAGE (page));
 #line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_CHECKERBOARD_PAGE (page));
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (page);
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_toolbar_set_view_filter (_tmp0_, _tmp2_);
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_view_filter_unref0 (_tmp2_);
 #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_view_filter_unref0 (_tmp2_);
+#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page));
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = checkerboard_page_get_search_view_filter (page);
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view_collection_install_view_filter (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_view_filter_unref0 (_tmp6_);
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp4_);
 #line 8287 "LibraryWindow.c"
 }
@@ -8296,33 +8296,33 @@ library_window_should_show_search_bar (LibraryWindow* self)
 	Page* _tmp1_;
 	Page* _tmp2_;
 	gboolean _tmp3_;
-#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE);
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
 #line 8311 "LibraryWindow.c"
 		gboolean _tmp4_;
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->is_search_toolbar_visible;
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_;
 #line 8317 "LibraryWindow.c"
 	} else {
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
 #line 8321 "LibraryWindow.c"
 	}
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 8327 "LibraryWindow.c"
 }
@@ -8334,15 +8334,15 @@ library_window_toggle_search_bar (LibraryWindow* self,
                                   CheckerboardPage* page)
 {
 	SearchFilterToolbar* _tmp0_;
-#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail ((page == NULL) || IS_CHECKERBOARD_PAGE (page));
 #line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail ((page == NULL) || IS_CHECKERBOARD_PAGE (page));
+#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_revealer_set_reveal_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_revealer_get_type (), GtkRevealer), show);
 #line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_revealer_set_reveal_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_revealer_get_type (), GtkRevealer), show);
+#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (show) {
 #line 8347 "LibraryWindow.c"
 		SearchFilterToolbar* _tmp1_;
@@ -8352,54 +8352,54 @@ library_window_toggle_search_bar (LibraryWindow* self,
 		ViewCollection* _tmp5_;
 		SearchViewFilter* _tmp6_;
 		SearchViewFilter* _tmp7_;
-#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_assert (NULL != page, "null != page");
 #line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_assert (NULL != page, "null != page");
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->search_toolbar;
-#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = checkerboard_page_get_search_view_filter (page);
-#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = _tmp2_;
-#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_toolbar_set_view_filter (_tmp1_, _tmp3_);
-#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_view_filter_unref0 (_tmp3_);
 #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_view_filter_unref0 (_tmp3_);
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page));
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = checkerboard_page_get_search_view_filter (page);
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		view_collection_install_view_filter (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_view_filter_unref0 (_tmp7_);
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp5_);
 #line 8381 "LibraryWindow.c"
 	} else {
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (page != NULL) {
 #line 8385 "LibraryWindow.c"
 			ViewCollection* _tmp8_;
 			ViewCollection* _tmp9_;
 			DisabledViewFilter* _tmp10_;
 			DisabledViewFilter* _tmp11_;
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page));
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = _tmp8_;
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp10_ = disabled_view_filter_new ();
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp11_ = _tmp10_;
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			view_collection_install_view_filter (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_view_filter_unref0 (_tmp11_);
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_tmp9_);
 #line 8404 "LibraryWindow.c"
 		}
@@ -8414,21 +8414,21 @@ library_window_on_page_created (LibraryWindow* self,
 {
 	GeeHashMap* _tmp0_;
 	GeeHashMap* _tmp1_;
-#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_PAGE (page));
 #line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_PAGE (page));
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->page_map;
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page), "!page_map.has_key(page)");
 #line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page), "!page_map.has_key(page)");
+#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->page_map;
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_add_to_stack (self, page);
 #line 8433 "LibraryWindow.c"
 }
@@ -8445,21 +8445,21 @@ library_window_on_destroying_page (LibraryWindow* self,
 	gboolean removed = FALSE;
 	GeeHashMap* _tmp8_;
 	gboolean _tmp9_;
-#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page == _tmp1_;
-#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
 #line 8464 "LibraryWindow.c"
 		LibraryBranch* _tmp3_;
@@ -8467,31 +8467,31 @@ library_window_on_destroying_page (LibraryWindow* self,
 		LibraryPhotosEntry* _tmp5_;
 		Page* _tmp6_;
 		Page* _tmp7_;
-#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->library_branch;
-#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = library_branch_get_photos_entry (_tmp3_);
-#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp7_);
-#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp7_);
 #line 8484 "LibraryWindow.c"
 	}
-#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_remove_from_stack (self, page);
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->page_map;
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page, NULL);
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	removed = _tmp9_;
 #line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	removed = _tmp9_;
+#line 1337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (removed, "removed");
 #line 8496 "LibraryWindow.c"
 }
@@ -8504,35 +8504,35 @@ library_window_on_sidebar_entry_selected (LibraryWindow* self,
 	SidebarPageRepresentative* page_rep = NULL;
 	SidebarPageRepresentative* _tmp0_;
 	SidebarPageRepresentative* _tmp1_;
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
 #line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
+#line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (selectable, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) selectable) : NULL);
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	page_rep = _tmp0_;
 #line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	page_rep = _tmp0_;
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_rep;
-#line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp1_ != NULL) {
 #line 8519 "LibraryWindow.c"
 		SidebarPageRepresentative* _tmp2_;
 		Page* _tmp3_;
 		Page* _tmp4_;
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = page_rep;
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = sidebar_page_representative_get_page (_tmp2_);
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp4_);
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp4_);
 #line 8533 "LibraryWindow.c"
 	}
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page_rep);
 #line 8537 "LibraryWindow.c"
 }
@@ -8555,77 +8555,77 @@ library_window_on_sidebar_selected_entry_removed (LibraryWindow* self,
 	LibraryPhotosEntry* _tmp27_;
 	Page* _tmp28_;
 	Page* _tmp29_;
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
-#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_last_imported_entry (_tmp0_);
-#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	last_import_entry = _tmp3_;
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (selectable, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) {
 #line 8574 "LibraryWindow.c"
 		LibraryLastImportSidebarEntry* _tmp5_;
 		gboolean _tmp6_;
 		gboolean _tmp7_;
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = last_import_entry;
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = library_hideable_page_entry_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry));
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp7_;
 #line 8586 "LibraryWindow.c"
 	} else {
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = FALSE;
 #line 8590 "LibraryWindow.c"
 	}
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
 #line 8594 "LibraryWindow.c"
 		LibraryLastImportSidebarEntry* _tmp8_;
 		Page* _tmp9_;
 		Page* _tmp10_;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = last_import_entry;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp10_);
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 8612 "LibraryWindow.c"
 	}
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (selectable, EVENTS_TYPE_EVENT_ENTRY)) {
 #line 8616 "LibraryWindow.c"
 		EventsBranch* _tmp12_;
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = self->priv->events_branch;
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
 #line 8622 "LibraryWindow.c"
 	} else {
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = FALSE;
 #line 8626 "LibraryWindow.c"
 	}
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_) {
 #line 8630 "LibraryWindow.c"
 		EventsBranch* _tmp13_;
@@ -8633,43 +8633,43 @@ library_window_on_sidebar_selected_entry_removed (LibraryWindow* self,
 		EventsMasterDirectoryEntry* _tmp15_;
 		Page* _tmp16_;
 		Page* _tmp17_;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = self->priv->events_branch;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = events_branch_get_master_entry (_tmp13_);
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = _tmp14_;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp17_);
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp17_);
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp15_);
-#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 8656 "LibraryWindow.c"
 	}
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (selectable, EVENTS_TYPE_DIRECTORY_ENTRY)) {
 #line 8660 "LibraryWindow.c"
 		EventsBranch* _tmp19_;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = self->priv->events_branch;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
 #line 8666 "LibraryWindow.c"
 	} else {
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = FALSE;
 #line 8670 "LibraryWindow.c"
 	}
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp18_) {
 #line 8674 "LibraryWindow.c"
 		EventsBranch* _tmp20_;
@@ -8677,43 +8677,43 @@ library_window_on_sidebar_selected_entry_removed (LibraryWindow* self,
 		EventsMasterDirectoryEntry* _tmp22_;
 		Page* _tmp23_;
 		Page* _tmp24_;
-#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = self->priv->events_branch;
-#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = events_branch_get_master_entry (_tmp20_);
-#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp22_ = _tmp21_;
-#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = _tmp23_;
-#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp24_);
-#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp24_);
-#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp22_);
-#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 8700 "LibraryWindow.c"
 	}
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = self->priv->library_branch;
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = library_branch_get_photos_entry (_tmp25_);
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp27_ = _tmp26_;
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = _tmp28_;
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp29_);
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp29_);
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (last_import_entry);
 #line 8718 "LibraryWindow.c"
 }
@@ -8724,7 +8724,7 @@ _library_window_on_update_properties_view_collection_items_state_changed (ViewCo
                                                                           GeeIterable* changed,
                                                                           gpointer self)
 {
-#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
 #line 8729 "LibraryWindow.c"
 }
@@ -8735,7 +8735,7 @@ _library_window_on_update_properties_data_collection_items_altered (DataCollecti
                                                                     GeeMap* items,
                                                                     gpointer self)
 {
-#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
 #line 8740 "LibraryWindow.c"
 }
@@ -8747,7 +8747,7 @@ _library_window_on_update_properties_data_collection_contents_altered (DataColle
                                                                        GeeIterable* removed,
                                                                        gpointer self)
 {
-#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
 #line 8752 "LibraryWindow.c"
 }
@@ -8758,7 +8758,7 @@ _library_window_on_update_properties_view_collection_items_visibility_changed (V
                                                                                GeeCollection* changed,
                                                                                gpointer self)
 {
-#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
 #line 8763 "LibraryWindow.c"
 }
@@ -8770,23 +8770,23 @@ library_window_subscribe_for_basic_information (LibraryWindow* self,
 {
 	ViewCollection* view = NULL;
 	ViewCollection* _tmp0_;
-#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_PAGE (page));
 #line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_PAGE (page));
+#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_get_view (page);
-#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp0_;
-#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (view, "items-state-changed", (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self, 0);
 #line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_update_properties_data_collection_items_altered, self, 0);
+	g_signal_connect_object (view, "items-state-changed", (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self, 0);
 #line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_update_properties_data_collection_items_altered, self, 0);
 #line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self, 0);
+#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (view, "items-visibility-changed", (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self, 0);
-#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
 #line 8791 "LibraryWindow.c"
 }
@@ -8802,31 +8802,31 @@ library_window_unsubscribe_from_basic_information (LibraryWindow* self,
 	guint _tmp2_;
 	guint _tmp3_;
 	guint _tmp4_;
-#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_PAGE (page));
 #line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_PAGE (page));
+#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_get_view (page);
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp0_;
-#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp1_, NULL, FALSE);
-#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self);
 #line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self);
+#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp2_, NULL, FALSE);
-#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_items_altered, self);
 #line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_items_altered, self);
+#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self);
 #line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self);
+#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp4_, NULL, FALSE);
-#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self);
-#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
 #line 8831 "LibraryWindow.c"
 }
@@ -8836,11 +8836,11 @@ static void
 library_window_on_update_properties (LibraryWindow* self)
 {
 	OneShotScheduler* _tmp0_;
-#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->properties_scheduler;
-#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	one_shot_scheduler_at_idle (_tmp0_);
 #line 8845 "LibraryWindow.c"
 }
@@ -8855,53 +8855,53 @@ library_window_on_update_properties_now (LibraryWindow* self)
 	ExtendedPropertiesWindow* _tmp6_;
 	gboolean _tmp7_;
 	gboolean _tmp8_;
-#line 1398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->bottom_frame;
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
 #line 8868 "LibraryWindow.c"
 		BasicProperties* _tmp3_;
 		Page* _tmp4_;
 		Page* _tmp5_;
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->basic_properties;
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
 #line 8882 "LibraryWindow.c"
 	}
-#line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->extended_properties;
-#line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
 #line 8892 "LibraryWindow.c"
 		ExtendedPropertiesWindow* _tmp9_;
 		Page* _tmp10_;
 		Page* _tmp11_;
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->extended_properties;
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		extended_properties_window_update_properties (_tmp9_, _tmp11_);
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
 #line 8906 "LibraryWindow.c"
 	}
@@ -9069,25 +9069,25 @@ library_window_mounted_camera_shell_notification (LibraryWindow* self,
 	GMount* mount = NULL;
 	gchar* alt_uri = NULL;
 	GError * _inner_error_ = NULL;
-#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (uri != NULL);
 #line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:1407: mount point reported: %s", uri);
-#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (!library_window_is_mount_uri_supported (uri)) {
+	g_return_if_fail (uri != NULL);
+#line 1408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:1408: mount point reported: %s", uri);
 #line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:1411: Unsupported mount scheme: %s", uri);
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (!library_window_is_mount_uri_supported (uri)) {
+#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:1412: Unsupported mount scheme: %s", uri);
+#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 9084 "LibraryWindow.c"
 	}
-#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_file_new_for_uri (uri);
-#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uri_file = _tmp0_;
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
 #line 9092 "LibraryWindow.c"
 	{
@@ -9095,26 +9095,26 @@ library_window_mounted_camera_shell_notification (LibraryWindow* self,
 		GFile* _tmp2_;
 		GMount* _tmp3_;
 		GMount* _tmp4_;
-#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = uri_file;
-#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = g_file_find_enclosing_mount (_tmp2_, NULL, &_inner_error_);
-#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _tmp3_;
-#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9106 "LibraryWindow.c"
 			goto __catch47_g_error;
 		}
-#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp1_;
-#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = NULL;
-#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		mount = _tmp4_;
-#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp1_);
 #line 9119 "LibraryWindow.c"
 	}
@@ -9124,98 +9124,98 @@ library_window_mounted_camera_shell_notification (LibraryWindow* self,
 		GError* err = NULL;
 		GError* _tmp5_;
 		const gchar* _tmp6_;
-#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
-#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_inner_error_ = NULL;
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = err;
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_->message;
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:1423: %s", _tmp6_);
-#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:1424: %s", _tmp6_);
+#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
-#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 9145 "LibraryWindow.c"
 	}
 	__finally47:
-#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
 #line 9160 "LibraryWindow.c"
 	}
-#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	alt_uri = NULL;
 #line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	alt_uri = NULL;
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (g_str_has_prefix (uri, "file://")) {
 #line 9166 "LibraryWindow.c"
 		gchar* _tmp7_;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = string_replace (uri, "file://", "disk:");
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = camera_table_get_port_uri (_tmp8_);
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (alt_uri);
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		alt_uri = _tmp9_;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp8_);
 #line 9182 "LibraryWindow.c"
 	}
-#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (at_startup) {
 #line 9186 "LibraryWindow.c"
 		const gchar* _tmp11_;
-#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!is_string_empty (uri)) {
 #line 9190 "LibraryWindow.c"
 			GeeHashSet* _tmp10_;
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp10_ = library_window_initial_camera_uris;
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), uri);
 #line 9196 "LibraryWindow.c"
 		}
-#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = alt_uri;
-#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!is_string_empty (_tmp11_)) {
 #line 9202 "LibraryWindow.c"
 			GeeHashSet* _tmp12_;
 			const gchar* _tmp13_;
-#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp12_ = library_window_initial_camera_uris;
-#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = alt_uri;
-#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
 #line 9211 "LibraryWindow.c"
 		}
 	}
-#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (alt_uri);
-#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
-#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
 #line 9220 "LibraryWindow.c"
 }
@@ -9234,80 +9234,80 @@ library_window_real_key_press_event (GtkWidget* base,
 	gboolean _tmp4_;
 	guint _tmp8_;
 	const gchar* _tmp9_;
-#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
 #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "has-focus", &_tmp3_, NULL);
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
 #line 9249 "LibraryWindow.c"
 		SidebarTree* _tmp5_;
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = self->priv->sidebar_tree;
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = sidebar_tree_is_keypress_interpreted (_tmp5_, event);
 #line 9255 "LibraryWindow.c"
 	} else {
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = FALSE;
 #line 9259 "LibraryWindow.c"
 	}
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp1_) {
 #line 9263 "LibraryWindow.c"
 		SidebarTree* _tmp6_;
 		gboolean _tmp7_ = FALSE;
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = self->priv->sidebar_tree;
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "key-press-event", event, &_tmp7_);
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp7_;
 #line 9272 "LibraryWindow.c"
 	} else {
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
 #line 9276 "LibraryWindow.c"
 	}
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
 #line 9284 "LibraryWindow.c"
 	}
-#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (GTK_WIDGET_CLASS (library_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), event)) {
 #line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (GTK_WIDGET_CLASS (library_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), event)) {
+#line 1451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
 #line 9292 "LibraryWindow.c"
 	}
-#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = event->keyval;
-#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = gdk_keyval_name (_tmp8_);
-#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (g_strcmp0 (_tmp9_, "Escape") == 0) {
 #line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_on_clear_search (self);
+	if (g_strcmp0 (_tmp9_, "Escape") == 0) {
 #line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		library_window_on_clear_search (self);
+#line 1455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
 #line 9306 "LibraryWindow.c"
 	}
-#line 1457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 1457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
 #line 9312 "LibraryWindow.c"
 }
@@ -9334,7 +9334,7 @@ library_window_get_PAGE_MIN_WIDTH (void)
 static gpointer
 _data_collection_ref0 (gpointer self)
 {
-#line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self ? data_collection_ref (self) : NULL;
 #line 9339 "LibraryWindow.c"
 }
@@ -9350,33 +9350,33 @@ library_window_fullscreen_photo_page_construct (GType object_type,
 	CollectionPage* _tmp0_;
 	Photo* _tmp1_;
 	ViewCollection* _tmp2_;
-#line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (collection), NULL);
-#line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_PHOTO (start), NULL);
-#line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail ((view == NULL) || IS_VIEW_COLLECTION (view), NULL);
-#line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = (LibraryWindowFullscreenPhotoPage*) library_photo_page_construct (object_type);
 #line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = (LibraryWindowFullscreenPhotoPage*) library_photo_page_construct (object_type);
+#line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = _g_object_ref0 (collection);
-#line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->collection);
-#line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->collection = _tmp0_;
 #line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->collection = _tmp0_;
+#line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (start);
-#line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->start);
-#line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->start = _tmp1_;
 #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->start = _tmp1_;
+#line 79 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _data_collection_ref0 (view);
-#line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (self->priv->view);
-#line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->view = _tmp2_;
-#line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self;
 #line 9381 "LibraryWindow.c"
 }
@@ -9387,7 +9387,7 @@ library_window_fullscreen_photo_page_new (CollectionPage* collection,
                                           Photo* start,
                                           ViewCollection* view)
 {
-#line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return library_window_fullscreen_photo_page_construct (LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, collection, start, view);
 #line 9392 "LibraryWindow.c"
 }
@@ -9400,17 +9400,17 @@ library_window_fullscreen_photo_page_real_switched_to (Page* base)
 	CollectionPage* _tmp0_;
 	Photo* _tmp1_;
 	ViewCollection* _tmp2_;
-#line 81 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
 #line 82 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
+#line 83 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->collection;
-#line 82 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->start;
-#line 82 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->view;
-#line 82 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_photo_page_display_for_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), _tmp0_, _tmp1_, _tmp2_);
-#line 84 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_CLASS (library_window_fullscreen_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), TYPE_PAGE, Page));
 #line 9415 "LibraryWindow.c"
 }
@@ -9420,7 +9420,7 @@ static void
 library_window_fullscreen_photo_page_real_switching_from (Page* base)
 {
 	LibraryWindowFullscreenPhotoPage * self;
-#line 87 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
 #line 9425 "LibraryWindow.c"
 }
@@ -9431,11 +9431,11 @@ library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base,
                                                                      GeeList* ui_filenames)
 {
 	LibraryWindowFullscreenPhotoPage * self;
-#line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
-#line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 93 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 94 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
 #line 9440 "LibraryWindow.c"
 }
@@ -9444,17 +9444,17 @@ library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base,
 static void
 library_window_fullscreen_photo_page_class_init (LibraryWindowFullscreenPhotoPageClass * klass)
 {
-#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_type_class_add_private (klass, sizeof (LibraryWindowFullscreenPhotoPagePrivate));
-#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	((PageClass *) klass)->switched_to = (void (*) (Page *)) library_window_fullscreen_photo_page_real_switched_to;
-#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	((PageClass *) klass)->switching_from = (void (*) (Page *)) library_window_fullscreen_photo_page_real_switching_from;
-#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) library_window_fullscreen_photo_page_real_init_collect_ui_filenames;
-#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_window_fullscreen_photo_page_finalize;
 #line 9459 "LibraryWindow.c"
 }
@@ -9463,7 +9463,7 @@ library_window_fullscreen_photo_page_class_init (LibraryWindowFullscreenPhotoPag
 static void
 library_window_fullscreen_photo_page_instance_init (LibraryWindowFullscreenPhotoPage * self)
 {
-#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv = LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_GET_PRIVATE (self);
 #line 9468 "LibraryWindow.c"
 }
@@ -9473,15 +9473,15 @@ static void
 library_window_fullscreen_photo_page_finalize (GObject * obj)
 {
 	LibraryWindowFullscreenPhotoPage * self;
-#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
 #line 71 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->collection);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
 #line 72 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->start);
+	_g_object_unref0 (self->priv->collection);
 #line 73 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->start);
+#line 74 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (self->priv->view);
-#line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (library_window_fullscreen_photo_page_parent_class)->finalize (obj);
 #line 9486 "LibraryWindow.c"
 }
@@ -9537,9 +9537,9 @@ library_window_class_init (LibraryWindowClass * klass)
 	G_OBJECT_CLASS (klass)->get_property = _vala_library_window_get_property;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_window_finalize;
-#line 122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_initial_camera_uris = _tmp0_;
 #line 9544 "LibraryWindow.c"
 }
@@ -9570,121 +9570,121 @@ library_window_instance_init (LibraryWindow * self)
 	GtkRevealer* _tmp19_;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv = LIBRARY_WINDOW_GET_PRIVATE (self);
-#line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_get_home_dir ();
-#line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->import_dir = _tmp1_;
 #line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->import_dir = _tmp1_;
+#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->import_recursive = TRUE;
-#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp2_);
-#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->sidebar_paned = _tmp2_;
 #line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->sidebar_paned = _tmp2_;
+#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp3_);
-#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->client_paned = _tmp3_;
 #line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->client_paned = _tmp3_;
+#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = (GtkFrame*) gtk_frame_new (NULL);
-#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp4_);
-#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->bottom_frame = _tmp4_;
-#line 104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->properties_scheduler = NULL;
 #line 105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->properties_scheduler = NULL;
+#line 106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->notify_library_is_home_dir = TRUE;
-#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = library_branch_new ();
-#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->library_branch = _tmp5_;
 #line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->library_branch = _tmp5_;
+#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = tags_branch_new ();
-#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->tags_branch = _tmp6_;
 #line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->tags_branch = _tmp6_;
+#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = folders_branch_new ();
-#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->folders_branch = _tmp7_;
 #line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->folders_branch = _tmp7_;
+#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = events_branch_new ();
-#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->events_branch = _tmp8_;
 #line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->events_branch = _tmp8_;
+#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = camera_branch_new ();
-#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->camera_branch = _tmp9_;
 #line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->camera_branch = _tmp9_;
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = searches_branch_new ();
-#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->saved_search_branch = _tmp10_;
 #line 115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->saved_search_branch = _tmp10_;
+#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = TRUE;
-#line 117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_map = _tmp11_;
-#line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->photo_page = NULL;
-#line 124 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->is_search_toolbar_visible = FALSE;
-#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = search_filter_actions_new ();
-#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->search_actions = _tmp12_;
-#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp13_);
-#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->top_section = _tmp13_;
 #line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->top_section = _tmp13_;
+#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = (GtkFrame*) gtk_frame_new (NULL);
-#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp14_);
-#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->background_progress_frame = _tmp14_;
 #line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->background_progress_frame = _tmp14_;
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp15_);
-#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->background_progress_bar = _tmp15_;
 #line 135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->background_progress_bar = _tmp15_;
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_displayed = FALSE;
-#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = basic_properties_new ();
-#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp16_);
-#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->basic_properties = _tmp16_;
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = (GtkStack*) gtk_stack_new ();
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp17_);
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->stack = _tmp17_;
 #line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->stack = _tmp17_;
+#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp18_);
-#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->layout = _tmp18_;
-#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = (GtkRevealer*) gtk_revealer_new ();
-#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp19_);
-#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->toolbar_revealer = _tmp19_;
-#line 145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->current_progress_priority = 0;
 #line 146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->current_progress_priority = 0;
+#line 147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = (guint) 0;
 #line 9689 "LibraryWindow.c"
 }
@@ -9728,49 +9728,49 @@ library_window_finalize (GObject * obj)
 	guint _tmp44_;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->sidebar_tree;
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("page-created", SIDEBAR_TYPE_TREE, &_tmp1_, NULL, FALSE);
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self);
 #line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self);
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_TREE, &_tmp3_, NULL, FALSE);
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self);
 #line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self);
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->sidebar_tree;
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("entry-selected", SIDEBAR_TYPE_TREE, &_tmp5_, NULL, FALSE);
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self);
 #line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self);
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->sidebar_tree;
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("selected-entry-removed", SIDEBAR_TYPE_TREE, &_tmp7_, NULL, FALSE);
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self);
-#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_unsubscribe_from_basic_information (self, _tmp9_);
-#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp9_);
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->extended_properties;
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("hide", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self);
 #line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self);
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->extended_properties;
-#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE);
-#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _library_window_show_extended_properties_gtk_widget_show, self);
 #line 9775 "LibraryWindow.c"
 	{
@@ -9781,25 +9781,25 @@ library_window_finalize (GObject * obj)
 		GeeCollection* _tmp17_;
 		GeeIterator* _tmp18_;
 		GeeIterator* _tmp19_;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = media_collection_registry_get_instance ();
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = _tmp14_;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = media_collection_registry_get_all (_tmp15_);
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = _tmp18_;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp17_);
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_collection_registry_unref0 (_tmp15_);
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_sources_it = _tmp19_;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
 #line 9804 "LibraryWindow.c"
 			GeeIterator* _tmp20_;
@@ -9810,155 +9810,155 @@ library_window_finalize (GObject * obj)
 			guint _tmp24_;
 			MediaSourceCollection* _tmp25_;
 			guint _tmp26_;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = _media_sources_it;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (!gee_iterator_next (_tmp20_)) {
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
 #line 9819 "LibraryWindow.c"
 			}
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = _media_sources_it;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = gee_iterator_get (_tmp21_);
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			media_sources = (MediaSourceCollection*) _tmp22_;
 #line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			media_sources = (MediaSourceCollection*) _tmp22_;
+#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp23_ = media_sources;
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp24_, NULL, FALSE);
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_handlers_disconnect_matched (_tmp23_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self);
 #line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			g_signal_handlers_disconnect_matched (_tmp23_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self);
+#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp25_ = media_sources;
-#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp26_, NULL, FALSE);
-#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _library_window_on_media_altered_data_collection_items_altered, self);
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
 #line 9841 "LibraryWindow.c"
 		}
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
 #line 9845 "LibraryWindow.c"
 	}
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp27_ = metadata_writer_get_instance ();
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = _tmp27_;
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp29_, NULL, FALSE);
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp28_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp29_, 0, NULL, (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self);
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp28_);
-#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = library_monitor_pool_get_instance ();
-#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = _tmp30_;
-#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = library_monitor_pool_get_monitor (_tmp31_);
-#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = _tmp32_;
-#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp31_);
-#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	monitor = _tmp33_;
 #line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	monitor = _tmp33_;
+#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = monitor;
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp34_ != NULL) {
 #line 9873 "LibraryWindow.c"
 		LibraryMonitor* _tmp35_;
-#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp35_ = monitor;
-#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_library_monitor_destroyed (self, _tmp35_);
 #line 9879 "LibraryWindow.c"
 	}
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp36_ = library_monitor_pool_get_instance ();
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = _tmp36_;
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp38_, NULL, FALSE);
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp37_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp38_, 0, NULL, (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self);
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp37_);
 #line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_library_monitor_pool_unref0 (_tmp37_);
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp39_ = library_monitor_pool_get_instance ();
-#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = _tmp39_;
-#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp41_, NULL, FALSE);
-#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp40_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp41_, 0, NULL, (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self);
-#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp40_);
-#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = camera_table_get_instance ();
-#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = _tmp42_;
-#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp44_, NULL, FALSE);
-#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp43_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _library_window_on_camera_added_camera_table_camera_added, self);
-#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_camera_table_unref0 (_tmp43_);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (monitor);
-#line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (self->priv->import_dir);
-#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->sidebar_paned);
 #line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->client_paned);
+	_g_object_unref0 (self->priv->sidebar_paned);
 #line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->client_paned);
+#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->bottom_frame);
-#line 104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_one_shot_scheduler_unref0 (self->priv->properties_scheduler);
-#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->sidebar_tree);
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->library_branch);
+	_g_object_unref0 (self->priv->sidebar_tree);
 #line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->tags_branch);
+	_g_object_unref0 (self->priv->library_branch);
 #line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->folders_branch);
+	_g_object_unref0 (self->priv->tags_branch);
 #line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->events_branch);
+	_g_object_unref0 (self->priv->folders_branch);
 #line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->camera_branch);
+	_g_object_unref0 (self->priv->events_branch);
 #line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->camera_branch);
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->saved_search_branch);
-#line 117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->page_map);
-#line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->photo_page);
-#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_search_filter_actions_unref0 (self->priv->search_actions);
 #line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_search_filter_actions_unref0 (self->priv->search_actions);
+#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->search_toolbar);
-#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->top_section);
 #line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->background_progress_frame);
+	_g_object_unref0 (self->priv->top_section);
 #line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->background_progress_frame);
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->background_progress_bar);
-#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->basic_properties);
 #line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->basic_properties);
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->extended_properties);
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->stack);
 #line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->layout);
+	_g_object_unref0 (self->priv->stack);
 #line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->right_vbox);
+	_g_object_unref0 (self->priv->layout);
 #line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->right_vbox);
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->toolbar_revealer);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (library_window_parent_class)->finalize (obj);
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index 47a0ad9..7f5100a 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -19,7 +19,8 @@ public class LibraryWindow : AppWindow {
     private const string[] SUPPORTED_MOUNT_SCHEMES = {
         "gphoto2:",
         "disk:",
-        "file:"
+        "file:",
+        "mtp:"
     };
     
     private const int BACKGROUND_PROGRESS_PULSE_MSEC = 250;
diff --git a/src/main.c b/src/main.c
index 2bdd384..589461d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -797,6 +797,10 @@ void direct_app_terminate (void);
 GOptionEntry* commandline_options_get_options (int* result_length1);
 static GOptionEntry* _vala_array_dup22 (GOptionEntry* self,
                                  int length);
+static void _vala_array_add72 (GOptionEntry* * array,
+                        int* length,
+                        int* size,
+                        const GOptionEntry* value);
 static void _vala_array_add73 (GOptionEntry* * array,
                         int* length,
                         int* size,
@@ -817,10 +821,6 @@ static void _vala_array_add77 (GOptionEntry* * array,
                         int* length,
                         int* size,
                         const GOptionEntry* value);
-static void _vala_array_add78 (GOptionEntry* * array,
-                        int* length,
-                        int* size,
-                        const GOptionEntry* value);
 static GOptionEntry* _vala_array_dup23 (GOptionEntry* self,
                                  int length);
 void _vala_main (gchar** args,
@@ -832,7 +832,7 @@ GFile* app_dirs_get_lib_dir (void);
 void app_dirs_terminate (void);
 #define RESOURCES_GIT_VERSION _GIT_VERSION
 gboolean library_window_is_mount_uri_supported (const gchar* uri);
-static void _vala_array_add79 (gchar** * array,
+static void _vala_array_add78 (gchar** * array,
                         int* length,
                         int* size,
                         gchar* value);
@@ -2156,7 +2156,7 @@ _vala_array_dup22 (GOptionEntry* self,
 
 
 static void
-_vala_array_add73 (GOptionEntry* * array,
+_vala_array_add72 (GOptionEntry* * array,
                    int* length,
                    int* size,
                    const GOptionEntry* value)
@@ -2176,7 +2176,7 @@ _vala_array_add73 (GOptionEntry* * array,
 
 
 static void
-_vala_array_add74 (GOptionEntry* * array,
+_vala_array_add73 (GOptionEntry* * array,
                    int* length,
                    int* size,
                    const GOptionEntry* value)
@@ -2196,7 +2196,7 @@ _vala_array_add74 (GOptionEntry* * array,
 
 
 static void
-_vala_array_add75 (GOptionEntry* * array,
+_vala_array_add74 (GOptionEntry* * array,
                    int* length,
                    int* size,
                    const GOptionEntry* value)
@@ -2216,7 +2216,7 @@ _vala_array_add75 (GOptionEntry* * array,
 
 
 static void
-_vala_array_add76 (GOptionEntry* * array,
+_vala_array_add75 (GOptionEntry* * array,
                    int* length,
                    int* size,
                    const GOptionEntry* value)
@@ -2236,7 +2236,7 @@ _vala_array_add76 (GOptionEntry* * array,
 
 
 static void
-_vala_array_add77 (GOptionEntry* * array,
+_vala_array_add76 (GOptionEntry* * array,
                    int* length,
                    int* size,
                    const GOptionEntry* value)
@@ -2256,7 +2256,7 @@ _vala_array_add77 (GOptionEntry* * array,
 
 
 static void
-_vala_array_add78 (GOptionEntry* * array,
+_vala_array_add77 (GOptionEntry* * array,
                    int* length,
                    int* size,
                    const GOptionEntry* value)
@@ -2387,7 +2387,7 @@ commandline_options_get_options (int* result_length1)
 #line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_ = datadir;
 #line 304 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add73 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp6_);
+	_vala_array_add72 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp6_);
 #line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_.long_name = "no-runtime-monitoring";
 #line 306 "/home/jens/Source/shotwell/src/main.vala"
@@ -2411,7 +2411,7 @@ commandline_options_get_options (int* result_length1)
 #line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp9_ = no_monitoring;
 #line 308 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add74 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp9_);
+	_vala_array_add73 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp9_);
 #line 310 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.long_name = "no-startup-progress";
 #line 310 "/home/jens/Source/shotwell/src/main.vala"
@@ -2435,7 +2435,7 @@ commandline_options_get_options (int* result_length1)
 #line 312 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp12_ = no_startup;
 #line 312 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add75 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_);
+	_vala_array_add74 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_);
 #line 314 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_.long_name = "version";
 #line 314 "/home/jens/Source/shotwell/src/main.vala"
@@ -2459,7 +2459,7 @@ commandline_options_get_options (int* result_length1)
 #line 316 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp15_ = version;
 #line 316 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add76 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp15_);
+	_vala_array_add75 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp15_);
 #line 318 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp16_.long_name = "fullscreen";
 #line 318 "/home/jens/Source/shotwell/src/main.vala"
@@ -2483,7 +2483,7 @@ commandline_options_get_options (int* result_length1)
 #line 320 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_ = fullscreen;
 #line 320 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add77 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp18_);
+	_vala_array_add76 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp18_);
 #line 322 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp19_.long_name = NULL;
 #line 322 "/home/jens/Source/shotwell/src/main.vala"
@@ -2507,7 +2507,7 @@ commandline_options_get_options (int* result_length1)
 #line 323 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_ = terminator;
 #line 323 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add78 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp21_);
+	_vala_array_add77 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp21_);
 #line 325 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp22_ = commandline_options_entries;
 #line 325 "/home/jens/Source/shotwell/src/main.vala"
@@ -2535,7 +2535,7 @@ commandline_options_get_options (int* result_length1)
 
 
 static void
-_vala_array_add79 (gchar** * array,
+_vala_array_add78 (gchar** * array,
                    int* length,
                    int* size,
                    gchar* value)
@@ -2816,7 +2816,7 @@ _vala_main (gchar** args,
 #line 390 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp29_ = g_strdup (_tmp28_);
 #line 390 "/home/jens/Source/shotwell/src/main.vala"
-					_vala_array_add79 (&mounts, &mounts_length1, &_mounts_size_, _tmp29_);
+					_vala_array_add78 (&mounts, &mounts_length1, &_mounts_size_, _tmp29_);
 #line 2813 "main.c"
 				} else {
 					gboolean _tmp30_ = FALSE;
diff --git a/ui/slideshow_settings.ui b/ui/slideshow_settings.ui
index 6f597b1..5400793 100644
--- a/ui/slideshow_settings.ui
+++ b/ui/slideshow_settings.ui
@@ -16,7 +16,7 @@
     <property name="step_increment">0.10000000000000001</property>
     <property name="page_increment">1</property>
   </object>
-  <template class="SettingsDialog" parent="GtkDialog">
+  <template class="SlideshowPageSettingsDialog" parent="GtkDialog">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Settings</property>
     <property name="modal">True</property>
@@ -258,8 +258,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">button1</action-widget>
-      <action-widget response="0">button2</action-widget>
+      <action-widget response="-6">button1</action-widget>
+      <action-widget response="-5">button2</action-widget>
     </action-widgets>
   </template>
 </interface>
author	Jörg Frings-Fürst <debian@jff.email>	2018-08-05 08:00:12 +0200
committer	Jörg Frings-Fürst <debian@jff.email>	2018-08-05 08:00:12 +0200
commit	8ae550d463720d5d1c0e253af29843ff15de1a54 (patch)
tree	b6be28a7d546e7a174910ee83d6af555ed8860fa
parent	709e2d6f5652ec90c194a4ec2b530bebc6f952cb (diff)
parent	9df0619e4e581eac73e5f3b76d271f1fff192f81 (diff)