summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-10-19 05:09:43 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-10-19 05:09:43 +0200
commit694c7e47ece2cd322b0d2b57b88933a22d2734db (patch)
treec098b2104f1b76db60dd1f50de060c4439437fd8 /src
parent6824050190585821a13ce0f52d314986a25d6c2a (diff)
parentb076314018e4b53d745823754a26eb6fb73a2801 (diff)
Merge tag 'upstream/0.24.1'
Upstream version 0.24.1
Diffstat (limited to 'src')
-rw-r--r--src/.unitize/_CameraInternals.c2
-rw-r--r--src/.unitize/_ConfigInternals.c2
-rw-r--r--src/.unitize/_CoreInternals.c2
-rw-r--r--src/.unitize/_DataImportsInternals.c2
-rw-r--r--src/.unitize/_DbInternals.c2
-rw-r--r--src/.unitize/_DirectInternals.c2
-rw-r--r--src/.unitize/_Direct_unitize_entry.c2
-rw-r--r--src/.unitize/_EditingToolsInternals.c2
-rw-r--r--src/.unitize/_EventsInternals.c2
-rw-r--r--src/.unitize/_FoldersInternals.c2
-rw-r--r--src/.unitize/_LibraryInternals.c2
-rw-r--r--src/.unitize/_Library_unitize_entry.c2
-rw-r--r--src/.unitize/_PhotosInternals.c2
-rw-r--r--src/.unitize/_PluginsInternals.c2
-rw-r--r--src/.unitize/_PublishingInternals.c2
-rw-r--r--src/.unitize/_SearchesInternals.c2
-rw-r--r--src/.unitize/_SidebarInternals.c2
-rw-r--r--src/.unitize/_SlideshowInternals.c2
-rw-r--r--src/.unitize/_TagsInternals.c2
-rw-r--r--src/.unitize/_ThreadsInternals.c2
-rw-r--r--src/.unitize/_UnitInternals.c2
-rw-r--r--src/.unitize/_UtilInternals.c2
-rw-r--r--src/AppDirs.c2
-rw-r--r--src/AppWindow.c3890
-rw-r--r--src/AppWindow.vala3
-rw-r--r--src/Application.c2
-rw-r--r--src/BatchImport.c2
-rw-r--r--src/Box.c2
-rw-r--r--src/CheckerboardLayout.c194
-rw-r--r--src/CollectionPage.c2
-rw-r--r--src/ColorTransformation.c30
-rw-r--r--src/CommandManager.c2
-rw-r--r--src/Commands.c184
-rw-r--r--src/CustomComponents.c2
-rw-r--r--src/Debug.c28
-rw-r--r--src/DesktopIntegration.c18
-rw-r--r--src/Dialogs.c238
-rw-r--r--src/Dimensions.c2
-rw-r--r--src/DirectoryMonitor.c2
-rw-r--r--src/Event.c1902
-rw-r--r--src/Event.vala4
-rw-r--r--src/Exporter.c2
-rw-r--r--src/International.c2
-rw-r--r--src/LibraryFiles.c2
-rw-r--r--src/LibraryMonitor.c2
-rw-r--r--src/MediaDataRepresentation.c6
-rw-r--r--src/MediaDataRepresentation.vala4
-rw-r--r--src/MediaInterfaces.c2
-rw-r--r--src/MediaMetadata.c40
-rw-r--r--src/MediaMonitor.c6
-rw-r--r--src/MediaMonitor.vala4
-rw-r--r--src/MediaPage.c2
-rw-r--r--src/MediaViewTracker.c2
-rw-r--r--src/MetadataWriter.c2
-rw-r--r--src/NaturalCollate.c148
-rw-r--r--src/Orientation.c2
-rw-r--r--src/Page.c2
-rw-r--r--src/Photo.c104
-rw-r--r--src/PhotoMonitor.c2
-rw-r--r--src/PhotoPage.c6
-rw-r--r--src/PhotoPage.vala2
-rw-r--r--src/PixbufCache.c2
-rw-r--r--src/Printing.c34
-rw-r--r--src/Properties.c232
-rw-r--r--src/Resources.c7
-rw-r--r--src/Resources.vala5
-rw-r--r--src/Screensaver.c2
-rw-r--r--src/SearchFilter.c14
-rw-r--r--src/SlideshowPage.c2
-rw-r--r--src/SortedList.c2
-rw-r--r--src/Tag.c130
-rw-r--r--src/Tag.vala4
-rw-r--r--src/Thumbnail.c2
-rw-r--r--src/ThumbnailCache.c2
-rw-r--r--src/TimedQueue.c2
-rw-r--r--src/Tombstone.c2
-rw-r--r--src/UnityProgressBar.c2
-rw-r--r--src/Upgrades.c2
-rw-r--r--src/VideoMetadata.c142
-rw-r--r--src/VideoMonitor.c2
-rw-r--r--src/VideoSupport.c78
-rw-r--r--src/camera/Branch.c2
-rw-r--r--src/camera/Camera.c2
-rw-r--r--src/camera/CameraTable.c184
-rw-r--r--src/camera/GPhoto.c82
-rw-r--r--src/camera/ImportPage.c98
-rw-r--r--src/config/Config.c2
-rw-r--r--src/config/ConfigurationInterfaces.c40
-rw-r--r--src/config/GSettingsEngine.c198
-rw-r--r--src/core/Alteration.c16
-rw-r--r--src/core/ContainerSourceCollection.c960
-rw-r--r--src/core/ContainerSourceCollection.vala13
-rw-r--r--src/core/Core.c2
-rw-r--r--src/core/DataCollection.c2
-rw-r--r--src/core/DataObject.c2
-rw-r--r--src/core/DataSet.c2
-rw-r--r--src/core/DataSource.c38
-rw-r--r--src/core/DataSourceTypes.c2
-rw-r--r--src/core/DataView.c2
-rw-r--r--src/core/DataViewTypes.c2
-rw-r--r--src/core/DatabaseSourceCollection.c2
-rw-r--r--src/core/SourceCollection.c2
-rw-r--r--src/core/SourceHoldingTank.c2
-rw-r--r--src/core/SourceInterfaces.c2
-rw-r--r--src/core/Tracker.c2
-rw-r--r--src/core/ViewCollection.c2542
-rw-r--r--src/core/ViewCollection.vala3
-rw-r--r--src/core/util.c2
-rw-r--r--src/data_imports/DataImportJob.c2
-rw-r--r--src/data_imports/DataImportSource.c2
-rw-r--r--src/data_imports/DataImports.c2
-rw-r--r--src/data_imports/DataImportsPluginHost.c2
-rw-r--r--src/data_imports/DataImportsUI.c2
-rw-r--r--src/db/DatabaseTable.c1763
-rw-r--r--src/db/DatabaseTable.vala10
-rw-r--r--src/db/Db.c2
-rw-r--r--src/db/EventTable.c2
-rw-r--r--src/db/PhotoTable.c2
-rw-r--r--src/db/SavedSearchDBTable.c2
-rw-r--r--src/db/TagTable.c92
-rw-r--r--src/db/TombstoneTable.c2
-rw-r--r--src/db/VersionTable.c2
-rw-r--r--src/db/VideoTable.c2
-rw-r--r--src/direct/Direct.c2
-rw-r--r--src/direct/DirectPhoto.c2
-rw-r--r--src/direct/DirectPhotoPage.c2
-rw-r--r--src/direct/DirectView.c2
-rw-r--r--src/direct/DirectWindow.c2
-rw-r--r--src/editing_tools/EditingTools.c12
-rw-r--r--src/editing_tools/StraightenTool.c2
-rw-r--r--src/events/Branch.c40
-rw-r--r--src/events/EventDirectoryItem.c2
-rw-r--r--src/events/EventPage.c2
-rw-r--r--src/events/Events.c2
-rw-r--r--src/events/EventsDirectoryPage.c52
-rw-r--r--src/folders/Branch.c2
-rw-r--r--src/folders/Folders.c2
-rw-r--r--src/folders/Page.c2
-rw-r--r--src/library/Branch.c2
-rw-r--r--src/library/FlaggedPage.c2
-rw-r--r--src/library/FlaggedSidebarEntry.c2
-rw-r--r--src/library/ImportQueuePage.c2
-rw-r--r--src/library/ImportQueueSidebarEntry.c2
-rw-r--r--src/library/LastImportPage.c2
-rw-r--r--src/library/LastImportSidebarEntry.c2
-rw-r--r--src/library/Library.c2
-rw-r--r--src/library/LibraryWindow.c82
-rw-r--r--src/library/OfflinePage.c2
-rw-r--r--src/library/OfflineSidebarEntry.c2
-rw-r--r--src/library/TrashPage.c2
-rw-r--r--src/library/TrashSidebarEntry.c2
-rw-r--r--src/main.c628
-rw-r--r--src/main.vala3
-rw-r--r--src/photos/BmpSupport.c4
-rw-r--r--src/photos/GRaw.c4
-rw-r--r--src/photos/GdkSupport.c6
-rw-r--r--src/photos/JfifSupport.c4
-rw-r--r--src/photos/PhotoFileAdapter.c2
-rw-r--r--src/photos/PhotoFileFormat.c2
-rw-r--r--src/photos/PhotoFileSniffer.c2
-rw-r--r--src/photos/PhotoMetadata.c1460
-rw-r--r--src/photos/PhotoMetadata.vala2
-rw-r--r--src/photos/Photos.c2
-rw-r--r--src/photos/PngSupport.c4
-rw-r--r--src/photos/RawSupport.c2
-rw-r--r--src/photos/TiffSupport.c4
-rw-r--r--src/plugins/DataImportsInterfaces.c2
-rw-r--r--src/plugins/ManifestWidget.c16
-rw-r--r--src/plugins/Plugins.c2
-rw-r--r--src/plugins/PublishingInterfaces.c2
-rw-r--r--src/plugins/SpitInterfaces.c2
-rw-r--r--src/plugins/StandardHostInterface.c2
-rw-r--r--src/plugins/TransitionsInterfaces.c2
-rw-r--r--src/publishing/APIGlue.c2
-rw-r--r--src/publishing/Publishing.c2
-rw-r--r--src/publishing/PublishingPluginHost.c2
-rw-r--r--src/publishing/PublishingUI.c2
-rw-r--r--src/searches/Branch.c2
-rw-r--r--src/searches/SavedSearchDialog.c16
-rw-r--r--src/searches/SavedSearchPage.c2
-rw-r--r--src/searches/SearchBoolean.c14
-rw-r--r--src/searches/Searches.c2
-rw-r--r--src/sidebar/Branch.c2
-rw-r--r--src/sidebar/Entry.c2
-rw-r--r--src/sidebar/Sidebar.c2
-rw-r--r--src/sidebar/Tree.c2
-rw-r--r--src/sidebar/common.c2
-rw-r--r--src/slideshow/Slideshow.c2
-rw-r--r--src/slideshow/TransitionEffects.c2
-rw-r--r--src/tags/Branch.c114
-rw-r--r--src/tags/HierarchicalTagIndex.c2
-rw-r--r--src/tags/HierarchicalTagUtilities.c448
-rw-r--r--src/tags/TagPage.c2
-rw-r--r--src/tags/Tags.c2
-rw-r--r--src/threads/BackgroundJob.c2
-rw-r--r--src/threads/Semaphore.c2
-rw-r--r--src/threads/Threads.c2
-rw-r--r--src/threads/Workers.c2
-rw-r--r--src/unit/Unit.c2
-rw-r--r--src/util/KeyValueMap.c58
-rw-r--r--src/util/Util.c2
-rw-r--r--src/util/file.c104
-rw-r--r--src/util/image.c2
-rw-r--r--src/util/misc.c44
-rw-r--r--src/util/string.c268
-rw-r--r--src/util/system.c2
-rw-r--r--src/util/ui.c2
207 files changed, 8609 insertions, 8558 deletions
diff --git a/src/.unitize/_CameraInternals.c b/src/.unitize/_CameraInternals.c
index 4b84aa5..43a4d52 100644
--- a/src/.unitize/_CameraInternals.c
+++ b/src/.unitize/_CameraInternals.c
@@ -1,4 +1,4 @@
-/* _CameraInternals.c generated by valac 0.32.1, the Vala compiler
+/* _CameraInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _CameraInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_ConfigInternals.c b/src/.unitize/_ConfigInternals.c
index d7eb0e4..e56e526 100644
--- a/src/.unitize/_ConfigInternals.c
+++ b/src/.unitize/_ConfigInternals.c
@@ -1,4 +1,4 @@
-/* _ConfigInternals.c generated by valac 0.32.1, the Vala compiler
+/* _ConfigInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _ConfigInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_CoreInternals.c b/src/.unitize/_CoreInternals.c
index f95207a..d4855d1 100644
--- a/src/.unitize/_CoreInternals.c
+++ b/src/.unitize/_CoreInternals.c
@@ -1,4 +1,4 @@
-/* _CoreInternals.c generated by valac 0.32.1, the Vala compiler
+/* _CoreInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _CoreInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_DataImportsInternals.c b/src/.unitize/_DataImportsInternals.c
index 2d2fc94..fe8100f 100644
--- a/src/.unitize/_DataImportsInternals.c
+++ b/src/.unitize/_DataImportsInternals.c
@@ -1,4 +1,4 @@
-/* _DataImportsInternals.c generated by valac 0.32.1, the Vala compiler
+/* _DataImportsInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _DataImportsInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_DbInternals.c b/src/.unitize/_DbInternals.c
index 47e29a8..2aa9d1b 100644
--- a/src/.unitize/_DbInternals.c
+++ b/src/.unitize/_DbInternals.c
@@ -1,4 +1,4 @@
-/* _DbInternals.c generated by valac 0.32.1, the Vala compiler
+/* _DbInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _DbInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_DirectInternals.c b/src/.unitize/_DirectInternals.c
index 2095fcb..85961e1 100644
--- a/src/.unitize/_DirectInternals.c
+++ b/src/.unitize/_DirectInternals.c
@@ -1,4 +1,4 @@
-/* _DirectInternals.c generated by valac 0.32.1, the Vala compiler
+/* _DirectInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _DirectInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_Direct_unitize_entry.c b/src/.unitize/_Direct_unitize_entry.c
index 148e461..acf3bbf 100644
--- a/src/.unitize/_Direct_unitize_entry.c
+++ b/src/.unitize/_Direct_unitize_entry.c
@@ -1,4 +1,4 @@
-/* _Direct_unitize_entry.c generated by valac 0.32.1, the Vala compiler
+/* _Direct_unitize_entry.c generated by valac 0.34.1, the Vala compiler
* generated from _Direct_unitize_entry.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_EditingToolsInternals.c b/src/.unitize/_EditingToolsInternals.c
index 5f351af..c5dd7fe 100644
--- a/src/.unitize/_EditingToolsInternals.c
+++ b/src/.unitize/_EditingToolsInternals.c
@@ -1,4 +1,4 @@
-/* _EditingToolsInternals.c generated by valac 0.32.1, the Vala compiler
+/* _EditingToolsInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _EditingToolsInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_EventsInternals.c b/src/.unitize/_EventsInternals.c
index 33088f7..2374260 100644
--- a/src/.unitize/_EventsInternals.c
+++ b/src/.unitize/_EventsInternals.c
@@ -1,4 +1,4 @@
-/* _EventsInternals.c generated by valac 0.32.1, the Vala compiler
+/* _EventsInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _EventsInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_FoldersInternals.c b/src/.unitize/_FoldersInternals.c
index 1a3988e..c960815 100644
--- a/src/.unitize/_FoldersInternals.c
+++ b/src/.unitize/_FoldersInternals.c
@@ -1,4 +1,4 @@
-/* _FoldersInternals.c generated by valac 0.32.1, the Vala compiler
+/* _FoldersInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _FoldersInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_LibraryInternals.c b/src/.unitize/_LibraryInternals.c
index 6d70073..15241b2 100644
--- a/src/.unitize/_LibraryInternals.c
+++ b/src/.unitize/_LibraryInternals.c
@@ -1,4 +1,4 @@
-/* _LibraryInternals.c generated by valac 0.32.1, the Vala compiler
+/* _LibraryInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _LibraryInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_Library_unitize_entry.c b/src/.unitize/_Library_unitize_entry.c
index 8e7246c..de79198 100644
--- a/src/.unitize/_Library_unitize_entry.c
+++ b/src/.unitize/_Library_unitize_entry.c
@@ -1,4 +1,4 @@
-/* _Library_unitize_entry.c generated by valac 0.32.1, the Vala compiler
+/* _Library_unitize_entry.c generated by valac 0.34.1, the Vala compiler
* generated from _Library_unitize_entry.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_PhotosInternals.c b/src/.unitize/_PhotosInternals.c
index 3710e7b..53ba06e 100644
--- a/src/.unitize/_PhotosInternals.c
+++ b/src/.unitize/_PhotosInternals.c
@@ -1,4 +1,4 @@
-/* _PhotosInternals.c generated by valac 0.32.1, the Vala compiler
+/* _PhotosInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _PhotosInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_PluginsInternals.c b/src/.unitize/_PluginsInternals.c
index 9a9ee42..be0be24 100644
--- a/src/.unitize/_PluginsInternals.c
+++ b/src/.unitize/_PluginsInternals.c
@@ -1,4 +1,4 @@
-/* _PluginsInternals.c generated by valac 0.32.1, the Vala compiler
+/* _PluginsInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _PluginsInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_PublishingInternals.c b/src/.unitize/_PublishingInternals.c
index b1d0861..a15f3ee 100644
--- a/src/.unitize/_PublishingInternals.c
+++ b/src/.unitize/_PublishingInternals.c
@@ -1,4 +1,4 @@
-/* _PublishingInternals.c generated by valac 0.32.1, the Vala compiler
+/* _PublishingInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _PublishingInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_SearchesInternals.c b/src/.unitize/_SearchesInternals.c
index 7b0f7e8..1fe85b9 100644
--- a/src/.unitize/_SearchesInternals.c
+++ b/src/.unitize/_SearchesInternals.c
@@ -1,4 +1,4 @@
-/* _SearchesInternals.c generated by valac 0.32.1, the Vala compiler
+/* _SearchesInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _SearchesInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_SidebarInternals.c b/src/.unitize/_SidebarInternals.c
index f312282..e7c951d 100644
--- a/src/.unitize/_SidebarInternals.c
+++ b/src/.unitize/_SidebarInternals.c
@@ -1,4 +1,4 @@
-/* _SidebarInternals.c generated by valac 0.32.1, the Vala compiler
+/* _SidebarInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _SidebarInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_SlideshowInternals.c b/src/.unitize/_SlideshowInternals.c
index 31b8124..d73c8f2 100644
--- a/src/.unitize/_SlideshowInternals.c
+++ b/src/.unitize/_SlideshowInternals.c
@@ -1,4 +1,4 @@
-/* _SlideshowInternals.c generated by valac 0.32.1, the Vala compiler
+/* _SlideshowInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _SlideshowInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_TagsInternals.c b/src/.unitize/_TagsInternals.c
index 599fb26..ae84543 100644
--- a/src/.unitize/_TagsInternals.c
+++ b/src/.unitize/_TagsInternals.c
@@ -1,4 +1,4 @@
-/* _TagsInternals.c generated by valac 0.32.1, the Vala compiler
+/* _TagsInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _TagsInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_ThreadsInternals.c b/src/.unitize/_ThreadsInternals.c
index 69712a7..528e290 100644
--- a/src/.unitize/_ThreadsInternals.c
+++ b/src/.unitize/_ThreadsInternals.c
@@ -1,4 +1,4 @@
-/* _ThreadsInternals.c generated by valac 0.32.1, the Vala compiler
+/* _ThreadsInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _ThreadsInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_UnitInternals.c b/src/.unitize/_UnitInternals.c
index 102107b..b76cc33 100644
--- a/src/.unitize/_UnitInternals.c
+++ b/src/.unitize/_UnitInternals.c
@@ -1,4 +1,4 @@
-/* _UnitInternals.c generated by valac 0.32.1, the Vala compiler
+/* _UnitInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _UnitInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/.unitize/_UtilInternals.c b/src/.unitize/_UtilInternals.c
index ddfb022..4dbd55a 100644
--- a/src/.unitize/_UtilInternals.c
+++ b/src/.unitize/_UtilInternals.c
@@ -1,4 +1,4 @@
-/* _UtilInternals.c generated by valac 0.32.1, the Vala compiler
+/* _UtilInternals.c generated by valac 0.34.1, the Vala compiler
* generated from _UtilInternals.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/AppDirs.c b/src/AppDirs.c
index 056b390..5112938 100644
--- a/src/AppDirs.c
+++ b/src/AppDirs.c
@@ -1,4 +1,4 @@
-/* AppDirs.c generated by valac 0.32.1, the Vala compiler
+/* AppDirs.c generated by valac 0.34.1, the Vala compiler
* generated from AppDirs.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/AppWindow.c b/src/AppWindow.c
index a707e4a..0c84f41 100644
--- a/src/AppWindow.c
+++ b/src/AppWindow.c
@@ -1,4 +1,4 @@
-/* AppWindow.c generated by valac 0.32.1, the Vala compiler
+/* AppWindow.c generated by valac 0.34.1, the Vala compiler
* generated from AppWindow.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -457,10 +457,7 @@ static void app_window_on_command_manager_altered (AppWindow* self);
static void _app_window_on_command_manager_altered_command_manager_altered (CommandManager* _sender, gboolean can_undo, gboolean can_redo, gpointer self);
GtkActionGroup** app_window_create_common_action_groups (AppWindow* self, int* result_length1);
gchar* build_dummy_ui_string (GtkActionGroup** groups, int groups_length1);
-#define RESOURCES_CUSTOM_CSS "LibraryWindow * {\n" \
-" -GtkPaned-handle-size: 1;\n" \
-" }\n" \
-" LibraryWindow .pane-separator {\n" \
+#define RESOURCES_CUSTOM_CSS "LibraryWindow .pane-separator {\n" \
" background-color: @borders;\n" \
" }\n" \
" SearchFilterToolbar {\n" \
@@ -730,6 +727,7 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
gint _tmp65_ = 0;
GdkRectangle _tmp66_ = {0};
gint _tmp67_ = 0;
+ Page* _tmp68_ = NULL;
GError * _inner_error_ = NULL;
#line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_PAGE (page), NULL);
@@ -743,7 +741,7 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
_tmp1_ = resources_get_ui ("fullscreen.ui");
#line 25 "/home/jens/Source/shotwell/src/AppWindow.vala"
ui_file = _tmp1_;
-#line 716 "AppWindow.c"
+#line 717 "AppWindow.c"
{
GtkUIManager* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
@@ -760,7 +758,7 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
_g_free0 (_tmp4_);
#line 28 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 733 "AppWindow.c"
+#line 734 "AppWindow.c"
goto __catch211_g_error;
}
}
@@ -787,7 +785,7 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
_g_free0 (_tmp6_);
#line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_error_free0 (err);
-#line 760 "AppWindow.c"
+#line 761 "AppWindow.c"
}
__finally211:
#line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -800,7 +798,7 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
g_clear_error (&_inner_error_);
#line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
return NULL;
-#line 773 "AppWindow.c"
+#line 774 "AppWindow.c"
}
#line 33 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = gtk_action_group_new ("FullscreenActionGroup");
@@ -840,13 +838,13 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
_tmp19_ = accel_group;
#line 39 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp19_ != NULL) {
-#line 813 "AppWindow.c"
+#line 814 "AppWindow.c"
GtkAccelGroup* _tmp20_ = NULL;
#line 40 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp20_ = accel_group;
#line 40 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_add_accel_group (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp20_);
-#line 819 "AppWindow.c"
+#line 820 "AppWindow.c"
}
#line 42 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp21_ = app_window_get_instance ();
@@ -956,13 +954,13 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
_tmp51_ = page;
#line 70 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, TYPE_SLIDESHOW_PAGE)) {
-#line 929 "AppWindow.c"
+#line 930 "AppWindow.c"
Page* _tmp52_ = NULL;
#line 72 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp52_ = page;
#line 72 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_SLIDESHOW_PAGE, SlideshowPage), "hide-toolbar", (GCallback) _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar, self, 0);
-#line 935 "AppWindow.c"
+#line 936 "AppWindow.c"
} else {
GtkToolbar* _tmp53_ = NULL;
GtkToggleToolButton* _tmp54_ = NULL;
@@ -972,7 +970,7 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
_tmp54_ = self->priv->pin_button;
#line 75 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_toolbar_insert (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 945 "AppWindow.c"
+#line 946 "AppWindow.c"
}
#line 78 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp55_ = page;
@@ -1022,6 +1020,10 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_POINTER_MOTION_MASK);
#line 100 "/home/jens/Source/shotwell/src/AppWindow.vala"
fullscreen_window_invoke_toolbar (self);
+#line 103 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ _tmp68_ = page;
+#line 103 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget));
#line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (accel_group);
#line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -1030,38 +1032,38 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
_g_object_unref0 (ui_file);
#line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
return self;
-#line 1003 "AppWindow.c"
+#line 1008 "AppWindow.c"
}
FullscreenWindow* fullscreen_window_new (Page* page) {
#line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
return fullscreen_window_construct (TYPE_FULLSCREEN_WINDOW, page);
-#line 1010 "AppWindow.c"
+#line 1015 "AppWindow.c"
}
void fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self) {
-#line 103 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 106 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 104 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->is_toolbar_dismissal_enabled = FALSE;
-#line 1019 "AppWindow.c"
+#line 1024 "AppWindow.c"
}
void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self) {
GtkToggleToolButton* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
-#line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 110 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 108 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 111 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->pin_button;
-#line 108 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 111 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = gtk_toggle_tool_button_get_active (_tmp0_);
-#line 108 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 111 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->is_toolbar_dismissal_enabled = !_tmp1_;
-#line 1034 "AppWindow.c"
+#line 1039 "AppWindow.c"
}
@@ -1074,31 +1076,31 @@ static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkR
GdkWindow* _tmp4_ = NULL;
gint _tmp5_ = 0;
GdkRectangle _tmp6_ = {0};
-#line 111 "/home/jens/Source/shotwell/src/AppWindow.vala"
- g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
+#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = app_window_get_instance ();
-#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _tmp2_;
-#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = gdk_screen_get_monitor_at_window (_tmp1_, _tmp4_);
-#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
gdk_screen_get_monitor_geometry (_tmp0_, _tmp5_, &_tmp6_);
-#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
monitor = _tmp6_;
-#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _g_object_unref0 (_tmp3_);
#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ _g_object_unref0 (_tmp3_);
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
*result = monitor;
-#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 1071 "AppWindow.c"
+#line 1076 "AppWindow.c"
}
@@ -1109,62 +1111,62 @@ static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEven
GdkEventConfigure* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
-#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 121 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = event;
-#line 121 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 121 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
_result_ = _tmp1_;
-#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 126 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->priv->switched_to;
-#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 126 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (!_tmp2_) {
-#line 1096 "AppWindow.c"
+#line 1101 "AppWindow.c"
Page* _tmp3_ = NULL;
Page* _tmp4_ = NULL;
-#line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = _tmp3_;
-#line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
page_switched_to (_tmp4_);
-#line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp4_);
-#line 125 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 128 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->switched_to = TRUE;
-#line 1109 "AppWindow.c"
+#line 1114 "AppWindow.c"
}
-#line 128 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 131 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _result_;
-#line 128 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 131 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1115 "AppWindow.c"
+#line 1120 "AppWindow.c"
}
static void _fullscreen_window_on_close_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 134 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
fullscreen_window_on_close ((FullscreenWindow*) self);
-#line 1122 "AppWindow.c"
+#line 1127 "AppWindow.c"
}
static void _vala_array_add158 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 138 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((*length) == (*size)) {
-#line 138 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 138 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
*array = g_renew (GtkActionEntry, *array, *size);
-#line 1133 "AppWindow.c"
+#line 1138 "AppWindow.c"
}
-#line 138 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[(*length)++] = *value;
-#line 1137 "AppWindow.c"
+#line 1142 "AppWindow.c"
}
@@ -1181,57 +1183,57 @@ static GtkActionEntry* fullscreen_window_create_actions (FullscreenWindow* self,
GtkActionEntry _tmp3_ = {0};
GtkActionEntry* _tmp4_ = NULL;
gint _tmp4__length1 = 0;
-#line 131 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 134 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), NULL);
-#line 132 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = g_new0 (GtkActionEntry, 0);
-#line 132 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
actions = _tmp0_;
-#line 132 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
actions_length1 = 0;
-#line 132 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
_actions_size_ = actions_length1;
-#line 134 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_.name = "LeaveFullscreen";
-#line 134 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_.stock_id = RESOURCES_LEAVE_FULLSCREEN_LABEL;
-#line 134 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_.label = TRANSLATABLE;
-#line 134 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_.accelerator = "F11";
-#line 134 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_.tooltip = TRANSLATABLE;
-#line 134 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_.callback = (GCallback) _fullscreen_window_on_close_gtk_action_callback;
-#line 134 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
leave_fullscreen = _tmp1_;
-#line 136 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
leave_fullscreen.label = RESOURCES_LEAVE_FULLSCREEN_LABEL;
-#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
leave_fullscreen.tooltip = RESOURCES_LEAVE_FULLSCREEN_LABEL;
-#line 138 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = actions;
-#line 138 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2__length1 = actions_length1;
-#line 138 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = leave_fullscreen;
-#line 138 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_array_add158 (&actions, &actions_length1, &_actions_size_, &_tmp3_);
-#line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = actions;
-#line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4__length1 = actions_length1;
-#line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (result_length1) {
-#line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
*result_length1 = _tmp4__length1;
-#line 1198 "AppWindow.c"
+#line 1203 "AppWindow.c"
}
-#line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp4_;
-#line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1204 "AppWindow.c"
+#line 1209 "AppWindow.c"
}
@@ -1247,68 +1249,68 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
GdkEventKey* _tmp8_ = NULL;
gboolean _tmp9_ = FALSE;
gboolean _tmp10_ = FALSE;
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 145 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 148 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = event;
-#line 145 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 148 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _tmp0_->keyval;
-#line 145 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 148 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 145 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 148 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 149 "/home/jens/Source/shotwell/src/AppWindow.vala"
fullscreen_window_on_close (self);
-#line 148 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 151 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 148 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 151 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1238 "AppWindow.c"
+#line 1243 "AppWindow.c"
}
-#line 152 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event != NULL) {
-#line 1242 "AppWindow.c"
+#line 1247 "AppWindow.c"
GdkEventKey* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
-#line 152 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = event;
-#line 152 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp4_);
-#line 152 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _tmp5_;
-#line 1251 "AppWindow.c"
+#line 1256 "AppWindow.c"
} else {
-#line 152 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = FALSE;
-#line 1255 "AppWindow.c"
+#line 1260 "AppWindow.c"
}
-#line 152 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp3_) {
-#line 153 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 156 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 153 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 156 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1263 "AppWindow.c"
+#line 1268 "AppWindow.c"
}
-#line 156 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = app_window_get_instance ();
-#line 156 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = _tmp6_;
-#line 156 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = event;
-#line 156 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp8_, &_tmp9_);
-#line 156 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = _tmp9_;
-#line 156 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp7_);
-#line 156 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp10_;
-#line 156 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1281 "AppWindow.c"
+#line 1286 "AppWindow.c"
}
@@ -1318,38 +1320,38 @@ static void fullscreen_window_on_close (FullscreenWindow* self) {
gboolean _tmp2_ = FALSE;
AppWindow* _tmp3_ = NULL;
AppWindow* _tmp4_ = NULL;
-#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 162 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 160 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = config_facade_get_instance ();
-#line 160 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _tmp0_;
-#line 160 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->priv->is_toolbar_dismissal_enabled;
-#line 160 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
configuration_facade_set_pin_toolbar_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
-#line 160 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp1_);
-#line 161 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 164 "/home/jens/Source/shotwell/src/AppWindow.vala"
fullscreen_window_hide_toolbar (self);
-#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = app_window_get_instance ();
-#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = _tmp3_;
-#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_end_fullscreen (_tmp4_);
-#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp4_);
-#line 1313 "AppWindow.c"
+#line 1318 "AppWindow.c"
}
void fullscreen_window_close (FullscreenWindow* self) {
-#line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 169 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 167 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 170 "/home/jens/Source/shotwell/src/AppWindow.vala"
fullscreen_window_on_close (self);
-#line 1322 "AppWindow.c"
+#line 1327 "AppWindow.c"
}
@@ -1358,36 +1360,36 @@ static void fullscreen_window_real_destroy (GtkWidget* base) {
Page* page = NULL;
Page* _tmp0_ = NULL;
Page* _tmp1_ = NULL;
-#line 170 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 173 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 171 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 174 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 171 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 174 "/home/jens/Source/shotwell/src/AppWindow.vala"
page = _tmp0_;
-#line 172 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 175 "/home/jens/Source/shotwell/src/AppWindow.vala"
page_window_clear_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 174 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 177 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = page;
-#line 174 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 177 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 1343 "AppWindow.c"
+#line 1348 "AppWindow.c"
Page* _tmp2_ = NULL;
Page* _tmp3_ = NULL;
-#line 175 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 178 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = page;
-#line 175 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 178 "/home/jens/Source/shotwell/src/AppWindow.vala"
page_stop_cursor_hiding (_tmp2_);
-#line 176 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = page;
-#line 176 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/AppWindow.vala"
page_switching_from (_tmp3_);
-#line 1354 "AppWindow.c"
+#line 1359 "AppWindow.c"
}
-#line 179 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/AppWindow.vala"
GTK_WIDGET_CLASS (fullscreen_window_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget));
-#line 170 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 173 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (page);
-#line 1360 "AppWindow.c"
+#line 1365 "AppWindow.c"
}
@@ -1396,34 +1398,34 @@ static gboolean fullscreen_window_real_delete_event (GtkWidget* base, GdkEventAn
gboolean result = FALSE;
AppWindow* _tmp0_ = NULL;
AppWindow* _tmp1_ = NULL;
-#line 182 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 185 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 182 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 185 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 183 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 186 "/home/jens/Source/shotwell/src/AppWindow.vala"
fullscreen_window_on_close (self);
-#line 184 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_get_instance ();
-#line 184 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _tmp0_;
-#line 184 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 184 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp1_);
-#line 186 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 189 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 186 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 189 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1387 "AppWindow.c"
+#line 1392 "AppWindow.c"
}
static gboolean _fullscreen_window_on_check_toolbar_invocation_gsource_func (gpointer self) {
gboolean result;
result = fullscreen_window_on_check_toolbar_invocation ((FullscreenWindow*) self);
-#line 195 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 198 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1396 "AppWindow.c"
+#line 1401 "AppWindow.c"
}
@@ -1432,64 +1434,64 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp4_ = FALSE;
-#line 189 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 192 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 189 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 192 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 190 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 193 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->is_toolbar_shown;
-#line 190 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 193 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (!_tmp0_) {
-#line 1413 "AppWindow.c"
+#line 1418 "AppWindow.c"
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
-#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 197 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->priv->waiting_for_invoke;
-#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 197 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (!_tmp2_) {
-#line 1420 "AppWindow.c"
+#line 1425 "AppWindow.c"
gboolean _tmp3_ = FALSE;
-#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 197 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = fullscreen_window_is_pointer_in_toolbar (self);
-#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 197 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _tmp3_;
-#line 1426 "AppWindow.c"
+#line 1431 "AppWindow.c"
} else {
-#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 197 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = FALSE;
-#line 1430 "AppWindow.c"
+#line 1435 "AppWindow.c"
}
-#line 194 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 197 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_) {
-#line 195 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 198 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) FULLSCREEN_WINDOW_TOOLBAR_INVOCATION_MSEC, _fullscreen_window_on_check_toolbar_invocation_gsource_func, g_object_ref (self), g_object_unref);
-#line 196 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->waiting_for_invoke = TRUE;
-#line 1438 "AppWindow.c"
+#line 1443 "AppWindow.c"
}
}
-#line 200 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event != NULL) {
-#line 1443 "AppWindow.c"
+#line 1448 "AppWindow.c"
GdkEventMotion* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
-#line 200 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = event;
-#line 200 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 200 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = _tmp6_;
-#line 1452 "AppWindow.c"
+#line 1457 "AppWindow.c"
} else {
-#line 200 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = FALSE;
-#line 1456 "AppWindow.c"
+#line 1461 "AppWindow.c"
}
-#line 200 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp4_;
-#line 200 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1462 "AppWindow.c"
+#line 1467 "AppWindow.c"
}
@@ -1510,57 +1512,57 @@ static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self)
gint _tmp9_ = 0;
gint _tmp10_ = 0;
gint _tmp11_ = 0;
-#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
-#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 207 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = gtk_widget_get_display (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 207 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = gdk_display_get_device_manager (_tmp0_);
-#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 207 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 207 "/home/jens/Source/shotwell/src/AppWindow.vala"
devmgr = _tmp2_;
-#line 205 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 208 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = devmgr;
-#line 205 "/home/jens/Source/shotwell/src/AppWindow.vala"
- if (_tmp3_ == NULL) {
-#line 206 "/home/jens/Source/shotwell/src/AppWindow.vala"
- g_debug ("AppWindow.vala:206: No device manager for display");
#line 208 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ if (_tmp3_ == NULL) {
+#line 209 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ g_debug ("AppWindow.vala:209: No device manager for display");
+#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = FALSE;
-#line 208 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (devmgr);
-#line 208 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1505 "AppWindow.c"
+#line 1510 "AppWindow.c"
}
-#line 212 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 215 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = devmgr;
-#line 212 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 215 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = gdk_device_manager_get_client_pointer (_tmp4_);
-#line 212 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 215 "/home/jens/Source/shotwell/src/AppWindow.vala"
gdk_device_get_position (_tmp5_, NULL, NULL, &_tmp6_);
-#line 212 "/home/jens/Source/shotwell/src/AppWindow.vala"
- py = _tmp6_;
#line 215 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ py = _tmp6_;
+#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = self->priv->toolbar;
-#line 215 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 215 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
gdk_window_get_geometry (_tmp8_, NULL, &_tmp9_, NULL, NULL);
-#line 215 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
wy = _tmp9_;
-#line 217 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = py;
-#line 217 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = wy;
-#line 217 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp10_ >= _tmp11_;
-#line 217 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (devmgr);
-#line 217 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1533 "AppWindow.c"
+#line 1538 "AppWindow.c"
}
@@ -1568,62 +1570,62 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
-#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
-#line 221 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->waiting_for_invoke = FALSE;
-#line 223 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->is_toolbar_shown;
-#line 223 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_) {
-#line 224 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = FALSE;
-#line 224 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1553 "AppWindow.c"
+#line 1558 "AppWindow.c"
}
-#line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 229 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = fullscreen_window_is_pointer_in_toolbar (self);
-#line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 229 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (!_tmp1_) {
-#line 227 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = FALSE;
-#line 227 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1563 "AppWindow.c"
+#line 1568 "AppWindow.c"
}
-#line 229 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/AppWindow.vala"
fullscreen_window_invoke_toolbar (self);
-#line 231 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = FALSE;
-#line 231 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1571 "AppWindow.c"
+#line 1576 "AppWindow.c"
}
static gboolean _fullscreen_window_on_check_toolbar_dismissal_gsource_func (gpointer self) {
gboolean result;
result = fullscreen_window_on_check_toolbar_dismissal ((FullscreenWindow*) self);
-#line 239 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 242 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1580 "AppWindow.c"
+#line 1585 "AppWindow.c"
}
static void fullscreen_window_invoke_toolbar (FullscreenWindow* self) {
GtkToolbar* _tmp0_ = NULL;
-#line 234 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 235 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->toolbar;
-#line 235 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 237 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->is_toolbar_shown = TRUE;
-#line 239 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 242 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) FULLSCREEN_WINDOW_TOOLBAR_CHECK_DISMISSAL_MSEC, _fullscreen_window_on_check_toolbar_dismissal_gsource_func, g_object_ref (self), g_object_unref);
-#line 1596 "AppWindow.c"
+#line 1601 "AppWindow.c"
}
@@ -1639,99 +1641,99 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
time_t _tmp7_ = 0;
time_t _tmp8_ = 0;
time_t _tmp9_ = 0;
-#line 242 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
-#line 243 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->is_toolbar_shown;
-#line 243 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (!_tmp0_) {
-#line 244 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = FALSE;
-#line 244 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1622 "AppWindow.c"
+#line 1627 "AppWindow.c"
}
-#line 247 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = self->priv->is_toolbar_dismissal_enabled;
-#line 247 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (!_tmp1_) {
-#line 248 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 248 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1632 "AppWindow.c"
+#line 1637 "AppWindow.c"
}
-#line 251 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = fullscreen_window_is_pointer_in_toolbar (self);
-#line 251 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_) {
-#line 252 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->left_toolbar_time = (time_t) 0;
-#line 254 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 257 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 254 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 257 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1644 "AppWindow.c"
+#line 1649 "AppWindow.c"
}
-#line 258 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = self->priv->left_toolbar_time;
-#line 258 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp3_ == ((time_t) 0)) {
-#line 1650 "AppWindow.c"
+#line 1655 "AppWindow.c"
time_t _tmp4_ = 0;
-#line 259 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = time (NULL);
-#line 259 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->left_toolbar_time = _tmp4_;
-#line 261 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 264 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 261 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 264 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1660 "AppWindow.c"
+#line 1665 "AppWindow.c"
}
-#line 265 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 268 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = time (NULL);
-#line 265 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 268 "/home/jens/Source/shotwell/src/AppWindow.vala"
now = _tmp5_;
-#line 266 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = now;
-#line 266 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = self->priv->left_toolbar_time;
-#line 266 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_assert (_tmp6_ >= _tmp7_, "now >= left_toolbar_time");
-#line 268 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = now;
-#line 268 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = self->priv->left_toolbar_time;
-#line 268 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 271 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((_tmp8_ - _tmp9_) < ((time_t) FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC)) {
-#line 269 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 269 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1682 "AppWindow.c"
+#line 1687 "AppWindow.c"
}
-#line 271 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 274 "/home/jens/Source/shotwell/src/AppWindow.vala"
fullscreen_window_hide_toolbar (self);
-#line 273 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = FALSE;
-#line 273 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1690 "AppWindow.c"
+#line 1695 "AppWindow.c"
}
static void fullscreen_window_hide_toolbar (FullscreenWindow* self) {
GtkToolbar* _tmp0_ = NULL;
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 279 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 277 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->toolbar;
-#line 277 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 278 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 281 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->is_toolbar_shown = FALSE;
-#line 1704 "AppWindow.c"
+#line 1709 "AppWindow.c"
}
@@ -1752,7 +1754,7 @@ static void fullscreen_window_class_init (FullscreenWindowClass * klass) {
((GtkWidgetClass *) klass)->motion_notify_event = fullscreen_window_real_motion_notify_event;
#line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
G_OBJECT_CLASS (klass)->finalize = fullscreen_window_finalize;
-#line 1725 "AppWindow.c"
+#line 1730 "AppWindow.c"
}
@@ -1790,7 +1792,7 @@ static void fullscreen_window_instance_init (FullscreenWindow * self) {
self->priv->left_toolbar_time = (time_t) 0;
#line 19 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->switched_to = FALSE;
-#line 1763 "AppWindow.c"
+#line 1768 "AppWindow.c"
}
@@ -1808,7 +1810,7 @@ static void fullscreen_window_finalize (GObject* obj) {
_g_object_unref0 (self->priv->pin_button);
#line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
G_OBJECT_CLASS (fullscreen_window_parent_class)->finalize (obj);
-#line 1781 "AppWindow.c"
+#line 1786 "AppWindow.c"
}
@@ -1825,34 +1827,34 @@ GType fullscreen_window_get_type (void) {
static void page_window_real_switched_pages (PageWindow* self, Page* old_page, Page* new_page) {
-#line 295 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 295 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 1802 "AppWindow.c"
+#line 1807 "AppWindow.c"
}
void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_page) {
-#line 295 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 295 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
PAGE_WINDOW_GET_CLASS (self)->switched_pages (self, old_page, new_page);
-#line 1811 "AppWindow.c"
+#line 1816 "AppWindow.c"
}
PageWindow* page_window_construct (GType object_type) {
PageWindow * self = NULL;
-#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = (PageWindow*) g_object_new (object_type, NULL);
-#line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) ((GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK) | GDK_STRUCTURE_MASK));
#line 303 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) ((GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK) | GDK_STRUCTURE_MASK));
+#line 306 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_set_has_resize_grip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppWindow.vala"
return self;
-#line 1825 "AppWindow.c"
+#line 1830 "AppWindow.c"
}
@@ -1860,17 +1862,17 @@ GtkUIManager* page_window_get_ui_manager (PageWindow* self) {
GtkUIManager* result = NULL;
GtkUIManager* _tmp0_ = NULL;
GtkUIManager* _tmp1_ = NULL;
-#line 306 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_PAGE_WINDOW (self), NULL);
-#line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 310 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->ui;
-#line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 310 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 310 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp1_;
-#line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 310 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1843 "AppWindow.c"
+#line 1848 "AppWindow.c"
}
@@ -1878,17 +1880,17 @@ Page* page_window_get_current_page (PageWindow* self) {
Page* result = NULL;
Page* _tmp0_ = NULL;
Page* _tmp1_ = NULL;
-#line 310 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_PAGE_WINDOW (self), NULL);
-#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->current_page;
-#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp1_;
-#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 1861 "AppWindow.c"
+#line 1866 "AppWindow.c"
}
@@ -1901,54 +1903,54 @@ static void page_window_real_set_current_page (PageWindow* self, Page* page) {
Page* _tmp5_ = NULL;
Page* _tmp6_ = NULL;
Page* _tmp7_ = NULL;
-#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_PAGE (page));
-#line 315 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->current_page;
-#line 315 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_ != NULL) {
-#line 1880 "AppWindow.c"
+#line 1885 "AppWindow.c"
Page* _tmp1_ = NULL;
-#line 316 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = self->priv->current_page;
-#line 316 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
page_clear_container (_tmp1_);
-#line 1886 "AppWindow.c"
+#line 1891 "AppWindow.c"
}
-#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->priv->current_page;
-#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
old_page = _tmp3_;
-#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = page;
-#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (self->priv->current_page);
-#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->current_page = _tmp5_;
-#line 320 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 323 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = self->priv->current_page;
-#line 320 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 323 "/home/jens/Source/shotwell/src/AppWindow.vala"
page_set_container (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = page;
-#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
page_window_switched_pages (self, old_page, _tmp7_);
-#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (old_page);
-#line 1912 "AppWindow.c"
+#line 1917 "AppWindow.c"
}
void page_window_set_current_page (PageWindow* self, Page* page) {
-#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
PAGE_WINDOW_GET_CLASS (self)->set_current_page (self, page);
-#line 1921 "AppWindow.c"
+#line 1926 "AppWindow.c"
}
@@ -1957,42 +1959,42 @@ static void page_window_real_clear_current_page (PageWindow* self) {
Page* old_page = NULL;
Page* _tmp2_ = NULL;
Page* _tmp3_ = NULL;
-#line 326 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->current_page;
-#line 326 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_ != NULL) {
-#line 1934 "AppWindow.c"
+#line 1939 "AppWindow.c"
Page* _tmp1_ = NULL;
-#line 327 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 330 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = self->priv->current_page;
-#line 327 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 330 "/home/jens/Source/shotwell/src/AppWindow.vala"
page_clear_container (_tmp1_);
-#line 1940 "AppWindow.c"
+#line 1945 "AppWindow.c"
}
-#line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->priv->current_page;
-#line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
old_page = _tmp3_;
-#line 330 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 333 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (self->priv->current_page);
-#line 330 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 333 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->current_page = NULL;
-#line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/AppWindow.vala"
page_window_switched_pages (self, old_page, NULL);
-#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (old_page);
-#line 1956 "AppWindow.c"
+#line 1961 "AppWindow.c"
}
void page_window_clear_current_page (PageWindow* self) {
-#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
PAGE_WINDOW_GET_CLASS (self)->clear_current_page (self);
-#line 1965 "AppWindow.c"
+#line 1970 "AppWindow.c"
}
@@ -2004,92 +2006,92 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
gboolean _tmp5_ = FALSE;
Page* _tmp6_ = NULL;
gboolean _tmp10_ = FALSE;
-#line 335 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 335 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 336 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 336 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) {
-#line 1985 "AppWindow.c"
+#line 1990 "AppWindow.c"
GtkWidget* _tmp2_ = NULL;
GdkEventKey* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 336 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 336 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = event;
-#line 336 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_emit_by_name (_tmp2_, "key-press-event", _tmp3_, &_tmp4_);
-#line 336 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp4_;
-#line 1997 "AppWindow.c"
+#line 2002 "AppWindow.c"
} else {
-#line 336 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = FALSE;
-#line 2001 "AppWindow.c"
+#line 2006 "AppWindow.c"
}
-#line 336 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_) {
-#line 337 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 340 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 337 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 340 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2009 "AppWindow.c"
+#line 2014 "AppWindow.c"
}
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = self->priv->current_page;
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp6_ != NULL) {
-#line 2015 "AppWindow.c"
+#line 2020 "AppWindow.c"
Page* _tmp7_ = NULL;
GdkEventKey* _tmp8_ = NULL;
gboolean _tmp9_ = FALSE;
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = self->priv->current_page;
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = event;
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = page_notify_app_key_pressed (_tmp7_, _tmp8_);
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _tmp9_;
-#line 2027 "AppWindow.c"
+#line 2032 "AppWindow.c"
} else {
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = FALSE;
-#line 2031 "AppWindow.c"
+#line 2036 "AppWindow.c"
}
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp5_) {
-#line 340 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 343 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 340 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 343 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2039 "AppWindow.c"
+#line 2044 "AppWindow.c"
}
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event != NULL) {
-#line 2043 "AppWindow.c"
+#line 2048 "AppWindow.c"
GdkEventKey* _tmp11_ = NULL;
gboolean _tmp12_ = FALSE;
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = event;
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = _tmp12_;
-#line 2052 "AppWindow.c"
+#line 2057 "AppWindow.c"
} else {
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = FALSE;
-#line 2056 "AppWindow.c"
+#line 2061 "AppWindow.c"
}
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp10_;
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2062 "AppWindow.c"
+#line 2067 "AppWindow.c"
}
@@ -2101,92 +2103,92 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
gboolean _tmp5_ = FALSE;
Page* _tmp6_ = NULL;
gboolean _tmp10_ = FALSE;
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) {
-#line 2082 "AppWindow.c"
+#line 2087 "AppWindow.c"
GtkWidget* _tmp2_ = NULL;
GdkEventKey* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = event;
-#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_emit_by_name (_tmp2_, "key-release-event", _tmp3_, &_tmp4_);
-#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp4_;
-#line 2094 "AppWindow.c"
+#line 2099 "AppWindow.c"
} else {
-#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = FALSE;
-#line 2098 "AppWindow.c"
+#line 2103 "AppWindow.c"
}
-#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_) {
-#line 347 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 350 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 347 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 350 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2106 "AppWindow.c"
+#line 2111 "AppWindow.c"
}
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = self->priv->current_page;
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp6_ != NULL) {
-#line 2112 "AppWindow.c"
+#line 2117 "AppWindow.c"
Page* _tmp7_ = NULL;
GdkEventKey* _tmp8_ = NULL;
gboolean _tmp9_ = FALSE;
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = self->priv->current_page;
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = event;
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = page_notify_app_key_released (_tmp7_, _tmp8_);
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _tmp9_;
-#line 2124 "AppWindow.c"
+#line 2129 "AppWindow.c"
} else {
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = FALSE;
-#line 2128 "AppWindow.c"
+#line 2133 "AppWindow.c"
}
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp5_) {
-#line 350 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 350 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2136 "AppWindow.c"
+#line 2141 "AppWindow.c"
}
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event != NULL) {
-#line 2140 "AppWindow.c"
+#line 2145 "AppWindow.c"
GdkEventKey* _tmp11_ = NULL;
gboolean _tmp12_ = FALSE;
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = event;
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = _tmp12_;
-#line 2149 "AppWindow.c"
+#line 2154 "AppWindow.c"
} else {
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = FALSE;
-#line 2153 "AppWindow.c"
+#line 2158 "AppWindow.c"
}
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp10_;
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2159 "AppWindow.c"
+#line 2164 "AppWindow.c"
}
@@ -2196,62 +2198,62 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
gboolean _tmp0_ = FALSE;
Page* _tmp1_ = NULL;
gboolean _tmp5_ = FALSE;
-#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 358 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 358 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 356 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = self->priv->current_page;
-#line 356 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 2177 "AppWindow.c"
+#line 2182 "AppWindow.c"
Page* _tmp2_ = NULL;
GdkEventFocus* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 356 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->priv->current_page;
-#line 356 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = event;
-#line 356 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = page_notify_app_focus_in (_tmp2_, _tmp3_);
-#line 356 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp4_;
-#line 2189 "AppWindow.c"
+#line 2194 "AppWindow.c"
} else {
-#line 356 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = FALSE;
-#line 2193 "AppWindow.c"
+#line 2198 "AppWindow.c"
}
-#line 356 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_) {
-#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2201 "AppWindow.c"
+#line 2206 "AppWindow.c"
}
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event != NULL) {
-#line 2205 "AppWindow.c"
+#line 2210 "AppWindow.c"
GdkEventFocus* _tmp6_ = NULL;
gboolean _tmp7_ = FALSE;
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = event;
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp6_);
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _tmp7_;
-#line 2214 "AppWindow.c"
+#line 2219 "AppWindow.c"
} else {
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = FALSE;
-#line 2218 "AppWindow.c"
+#line 2223 "AppWindow.c"
}
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp5_;
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2224 "AppWindow.c"
+#line 2229 "AppWindow.c"
}
@@ -2261,62 +2263,62 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
gboolean _tmp0_ = FALSE;
Page* _tmp1_ = NULL;
gboolean _tmp5_ = FALSE;
-#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 365 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 365 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 363 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = self->priv->current_page;
-#line 363 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 2242 "AppWindow.c"
+#line 2247 "AppWindow.c"
Page* _tmp2_ = NULL;
GdkEventFocus* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 363 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->priv->current_page;
-#line 363 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = event;
-#line 363 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = page_notify_app_focus_out (_tmp2_, _tmp3_);
-#line 363 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp4_;
-#line 2254 "AppWindow.c"
+#line 2259 "AppWindow.c"
} else {
-#line 363 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = FALSE;
-#line 2258 "AppWindow.c"
+#line 2263 "AppWindow.c"
}
-#line 363 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_) {
-#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 367 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 367 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2266 "AppWindow.c"
+#line 2271 "AppWindow.c"
}
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event != NULL) {
-#line 2270 "AppWindow.c"
+#line 2275 "AppWindow.c"
GdkEventFocus* _tmp6_ = NULL;
gboolean _tmp7_ = FALSE;
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = event;
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp6_);
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _tmp7_;
-#line 2279 "AppWindow.c"
+#line 2284 "AppWindow.c"
} else {
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = FALSE;
-#line 2283 "AppWindow.c"
+#line 2288 "AppWindow.c"
}
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp5_;
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2289 "AppWindow.c"
+#line 2294 "AppWindow.c"
}
@@ -2325,55 +2327,55 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi
gboolean result = FALSE;
Page* _tmp0_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 370 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->current_page;
-#line 370 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_ != NULL) {
-#line 2306 "AppWindow.c"
+#line 2311 "AppWindow.c"
Page* _tmp1_ = NULL;
GdkEventConfigure* _tmp2_ = NULL;
gboolean _tmp3_ = FALSE;
-#line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = self->priv->current_page;
-#line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = event;
-#line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = page_notify_configure_event (_tmp1_, _tmp2_);
-#line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp3_) {
-#line 372 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = TRUE;
-#line 372 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2322 "AppWindow.c"
+#line 2327 "AppWindow.c"
}
}
-#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (GTK_WIDGET_CLASS (page_window_parent_class)->configure_event != NULL) {
-#line 2327 "AppWindow.c"
+#line 2332 "AppWindow.c"
GdkEventConfigure* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
-#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = event;
-#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = GTK_WIDGET_CLASS (page_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = _tmp6_;
-#line 2336 "AppWindow.c"
+#line 2341 "AppWindow.c"
} else {
-#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = FALSE;
-#line 2340 "AppWindow.c"
+#line 2345 "AppWindow.c"
}
-#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp4_;
-#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 2346 "AppWindow.c"
+#line 2351 "AppWindow.c"
}
@@ -2382,31 +2384,31 @@ void page_window_set_busy_cursor (PageWindow* self) {
GdkWindow* _tmp1_ = NULL;
GdkCursor* _tmp2_ = NULL;
GdkCursor* _tmp3_ = NULL;
-#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 381 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 379 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 382 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->busy_counter;
-#line 379 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 382 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->busy_counter = _tmp0_ + 1;
-#line 379 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 382 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_ > 0) {
-#line 380 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 383 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 2365 "AppWindow.c"
+#line 2370 "AppWindow.c"
}
-#line 382 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 382 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = gdk_cursor_new (GDK_WATCH);
-#line 382 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _tmp2_;
-#line 382 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
gdk_window_set_cursor (_tmp1_, _tmp3_);
-#line 382 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp3_);
-#line 383 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 386 "/home/jens/Source/shotwell/src/AppWindow.vala"
spin_event_loop ();
-#line 2379 "AppWindow.c"
+#line 2384 "AppWindow.c"
}
@@ -2415,103 +2417,103 @@ void page_window_set_normal_cursor (PageWindow* self) {
GdkWindow* _tmp3_ = NULL;
GdkCursor* _tmp4_ = NULL;
GdkCursor* _tmp5_ = NULL;
-#line 386 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 389 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 387 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 390 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->priv->busy_counter;
-#line 387 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 390 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_ <= 0) {
-#line 388 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 391 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->busy_counter = 0;
-#line 389 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 2398 "AppWindow.c"
+#line 2403 "AppWindow.c"
} else {
gint _tmp1_ = 0;
gint _tmp2_ = 0;
-#line 390 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 393 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = self->priv->busy_counter;
-#line 390 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 393 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->busy_counter = _tmp1_ - 1;
-#line 390 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 393 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->priv->busy_counter;
-#line 390 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 393 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_ > 0) {
-#line 391 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 394 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 2412 "AppWindow.c"
+#line 2417 "AppWindow.c"
}
}
-#line 394 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 397 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 394 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 397 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = gdk_cursor_new (GDK_LEFT_PTR);
-#line 394 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 397 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _tmp4_;
-#line 394 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 397 "/home/jens/Source/shotwell/src/AppWindow.vala"
gdk_window_set_cursor (_tmp3_, _tmp5_);
-#line 394 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 397 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp5_);
-#line 395 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 398 "/home/jens/Source/shotwell/src/AppWindow.vala"
spin_event_loop ();
-#line 2427 "AppWindow.c"
+#line 2432 "AppWindow.c"
}
static void page_window_class_init (PageWindowClass * klass) {
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
page_window_parent_class = g_type_class_peek_parent (klass);
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_type_class_add_private (klass, sizeof (PageWindowPrivate));
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
((PageWindowClass *) klass)->switched_pages = page_window_real_switched_pages;
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
((PageWindowClass *) klass)->set_current_page = page_window_real_set_current_page;
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
((PageWindowClass *) klass)->clear_current_page = page_window_real_clear_current_page;
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
((GtkWidgetClass *) klass)->key_press_event = page_window_real_key_press_event;
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
((GtkWidgetClass *) klass)->key_release_event = page_window_real_key_release_event;
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
((GtkWidgetClass *) klass)->focus_in_event = page_window_real_focus_in_event;
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
((GtkWidgetClass *) klass)->focus_out_event = page_window_real_focus_out_event;
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
((GtkWidgetClass *) klass)->configure_event = page_window_real_configure_event;
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
G_OBJECT_CLASS (klass)->finalize = page_window_finalize;
-#line 2454 "AppWindow.c"
+#line 2459 "AppWindow.c"
}
static void page_window_instance_init (PageWindow * self) {
GtkUIManager* _tmp0_ = NULL;
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv = PAGE_WINDOW_GET_PRIVATE (self);
-#line 290 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = gtk_ui_manager_new ();
-#line 290 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->ui = _tmp0_;
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 295 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->current_page = NULL;
-#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->busy_counter = 0;
-#line 2470 "AppWindow.c"
+#line 2475 "AppWindow.c"
}
static void page_window_finalize (GObject* obj) {
PageWindow * self;
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_WINDOW, PageWindow);
-#line 290 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (self->ui);
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 295 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (self->priv->current_page);
-#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
G_OBJECT_CLASS (page_window_parent_class)->finalize (obj);
-#line 2484 "AppWindow.c"
+#line 2489 "AppWindow.c"
}
@@ -2528,9 +2530,9 @@ GType page_window_get_type (void) {
static void _app_window_on_command_manager_altered_command_manager_altered (CommandManager* _sender, gboolean can_undo, gboolean can_redo, gpointer self) {
-#line 447 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_command_manager_altered ((AppWindow*) self);
-#line 2503 "AppWindow.c"
+#line 2508 "AppWindow.c"
}
@@ -2556,139 +2558,139 @@ AppWindow* app_window_construct (GType object_type) {
GtkCssProvider* provider = NULL;
GtkCssProvider* _tmp32_ = NULL;
GError * _inner_error_ = NULL;
-#line 424 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = (AppWindow*) page_window_construct (object_type);
-#line 426 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 429 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_instance;
-#line 426 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 429 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_assert (_tmp0_ == NULL, "instance == null");
-#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _g_object_ref0 (self);
-#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (app_window_instance);
-#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_instance = _tmp1_;
-#line 429 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
-#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_window_set_default_icon_name ("shotwell");
#line 433 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ gtk_window_set_default_icon_name ("shotwell");
+#line 436 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_LIBRARY_WINDOW)) {
-#line 2547 "AppWindow.c"
+#line 2552 "AppWindow.c"
ConfigFacade* _tmp2_ = NULL;
ConfigFacade* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
Dimensions _tmp5_ = {0};
-#line 434 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = config_facade_get_instance ();
-#line 434 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _tmp2_;
-#line 434 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
configuration_facade_get_library_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp4_, &_tmp5_);
-#line 434 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->maximized = _tmp4_;
-#line 434 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->dimensions = _tmp5_;
-#line 434 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp3_);
-#line 2564 "AppWindow.c"
+#line 2569 "AppWindow.c"
} else {
ConfigFacade* _tmp6_ = NULL;
ConfigFacade* _tmp7_ = NULL;
gboolean _tmp8_ = FALSE;
Dimensions _tmp9_ = {0};
-#line 436 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_WINDOW), "this is DirectWindow");
-#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = config_facade_get_instance ();
-#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = _tmp6_;
-#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
configuration_facade_get_direct_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp8_, &_tmp9_);
-#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->maximized = _tmp8_;
-#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->dimensions = _tmp9_;
-#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp7_);
-#line 2584 "AppWindow.c"
+#line 2589 "AppWindow.c"
}
-#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = self->dimensions;
-#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = _tmp10_.width;
-#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = self->dimensions;
-#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = _tmp12_.height;
-#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp11_, _tmp13_);
-#line 442 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_ = self->maximized;
-#line 442 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp14_) {
-#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 446 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_maximize (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 2602 "AppWindow.c"
+#line 2607 "AppWindow.c"
}
-#line 445 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = app_window_command_manager;
-#line 445 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_assert (_tmp15_ == NULL, "command_manager == null");
-#line 446 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16_ = command_manager_new (COMMAND_MANAGER_DEFAULT_DEPTH);
-#line 446 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
_command_manager_unref0 (app_window_command_manager);
-#line 446 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_command_manager = _tmp16_;
-#line 447 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp17_ = app_window_command_manager;
-#line 447 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_connect_object (_tmp17_, "altered", (GCallback) _app_window_on_command_manager_altered_command_manager_altered, self, 0);
-#line 454 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp19_ = app_window_create_common_action_groups (self, &_tmp18_);
-#line 454 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->common_action_groups = (_vala_array_free (self->common_action_groups, self->common_action_groups_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 454 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->common_action_groups = _tmp19_;
-#line 454 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 457 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->common_action_groups_length1 = _tmp18_;
-#line 455 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp20_ = self->common_action_groups;
-#line 455 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp20__length1 = self->common_action_groups_length1;
-#line 2630 "AppWindow.c"
+#line 2635 "AppWindow.c"
{
GtkActionGroup** group_collection = NULL;
gint group_collection_length1 = 0;
gint _group_collection_size_ = 0;
gint group_it = 0;
-#line 455 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
group_collection = _tmp20_;
-#line 455 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
group_collection_length1 = _tmp20__length1;
-#line 455 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
for (group_it = 0; group_it < _tmp20__length1; group_it = group_it + 1) {
-#line 2642 "AppWindow.c"
+#line 2647 "AppWindow.c"
GtkActionGroup* _tmp21_ = NULL;
GtkActionGroup* group = NULL;
-#line 455 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp21_ = _g_object_ref0 (group_collection[group_it]);
-#line 455 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
group = _tmp21_;
-#line 2649 "AppWindow.c"
+#line 2654 "AppWindow.c"
{
GtkUIManager* _tmp22_ = NULL;
GtkActionGroup* _tmp23_ = NULL;
-#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
-#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp23_ = group;
-#line 456 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_ui_manager_insert_action_group (_tmp22_, _tmp23_, 0);
-#line 455 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (group);
-#line 2661 "AppWindow.c"
+#line 2666 "AppWindow.c"
}
}
}
@@ -2698,23 +2700,23 @@ AppWindow* app_window_construct (GType object_type) {
gint _tmp25__length1 = 0;
gchar* _tmp26_ = NULL;
gchar* _tmp27_ = NULL;
-#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
-#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp25_ = self->common_action_groups;
-#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp25__length1 = self->common_action_groups_length1;
-#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp26_ = build_dummy_ui_string (_tmp25_, _tmp25__length1);
-#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp27_ = _tmp26_;
-#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_ui_manager_add_ui_from_string (_tmp24_, _tmp27_, (gssize) -1, &_inner_error_);
-#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp27_);
-#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2687 "AppWindow.c"
+#line 2692 "AppWindow.c"
goto __catch212_g_error;
}
}
@@ -2723,58 +2725,58 @@ AppWindow* app_window_construct (GType object_type) {
{
GError* err = NULL;
const gchar* _tmp28_ = NULL;
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
err = _inner_error_;
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _inner_error_ = NULL;
#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ _inner_error_ = NULL;
+#line 464 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp28_ = err->message;
+#line 464 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ g_error ("AppWindow.vala:464: Unable to add AppWindow UI: %s", _tmp28_);
#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
- g_error ("AppWindow.vala:461: Unable to add AppWindow UI: %s", _tmp28_);
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_error_free0 (err);
-#line 2706 "AppWindow.c"
+#line 2711 "AppWindow.c"
}
__finally212:
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_clear_error (&_inner_error_);
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
return NULL;
-#line 2717 "AppWindow.c"
+#line 2722 "AppWindow.c"
}
-#line 464 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp29_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
-#line 464 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_ui_manager_ensure_update (_tmp29_);
-#line 465 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
-#line 465 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp31_ = gtk_ui_manager_get_accel_group (_tmp30_);
-#line 465 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_add_accel_group (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp31_);
-#line 467 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp32_ = gtk_css_provider_new ();
-#line 467 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
provider = _tmp32_;
-#line 2733 "AppWindow.c"
+#line 2738 "AppWindow.c"
{
GdkScreen* _tmp33_ = NULL;
-#line 469 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_css_provider_load_from_data (provider, RESOURCES_CUSTOM_CSS, (gssize) -1, &_inner_error_);
-#line 469 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2740 "AppWindow.c"
+#line 2745 "AppWindow.c"
goto __catch213_g_error;
}
-#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp33_ = gdk_screen_get_default ();
-#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_style_context_add_provider_for_screen (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (provider, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-#line 2747 "AppWindow.c"
+#line 2752 "AppWindow.c"
}
goto __finally213;
__catch213_g_error:
@@ -2782,280 +2784,280 @@ AppWindow* app_window_construct (GType object_type) {
GError* err = NULL;
GError* _tmp34_ = NULL;
const gchar* _tmp35_ = NULL;
-#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
err = _inner_error_;
-#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
_inner_error_ = NULL;
-#line 472 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp34_ = err;
-#line 472 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp35_ = _tmp34_->message;
-#line 472 "/home/jens/Source/shotwell/src/AppWindow.vala"
- g_debug ("AppWindow.vala:472: Unable to load custom CSS: %s", _tmp35_);
-#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ g_debug ("AppWindow.vala:475: Unable to load custom CSS: %s", _tmp35_);
+#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_error_free0 (err);
-#line 2767 "AppWindow.c"
+#line 2772 "AppWindow.c"
}
__finally213:
-#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (provider);
-#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_clear_error (&_inner_error_);
-#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
return NULL;
-#line 2780 "AppWindow.c"
+#line 2785 "AppWindow.c"
}
-#line 424 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (provider);
-#line 424 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
return self;
-#line 2786 "AppWindow.c"
+#line 2791 "AppWindow.c"
}
static void _app_window_on_quit_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_quit ((AppWindow*) self);
-#line 2793 "AppWindow.c"
+#line 2798 "AppWindow.c"
}
static void _vala_array_add159 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((*length) == (*size)) {
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
*array = g_renew (GtkActionEntry, *array, *size);
-#line 2804 "AppWindow.c"
+#line 2809 "AppWindow.c"
}
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[(*length)++] = *value;
-#line 2808 "AppWindow.c"
+#line 2813 "AppWindow.c"
}
static void _app_window_on_about_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 484 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_about ((AppWindow*) self);
-#line 2815 "AppWindow.c"
+#line 2820 "AppWindow.c"
}
static void _vala_array_add160 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((*length) == (*size)) {
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
*array = g_renew (GtkActionEntry, *array, *size);
-#line 2826 "AppWindow.c"
+#line 2831 "AppWindow.c"
}
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[(*length)++] = *value;
-#line 2830 "AppWindow.c"
+#line 2835 "AppWindow.c"
}
static void _app_window_on_fullscreen_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 489 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_fullscreen ((AppWindow*) self);
-#line 2837 "AppWindow.c"
+#line 2842 "AppWindow.c"
}
static void _vala_array_add161 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((*length) == (*size)) {
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
*array = g_renew (GtkActionEntry, *array, *size);
-#line 2848 "AppWindow.c"
+#line 2853 "AppWindow.c"
}
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[(*length)++] = *value;
-#line 2852 "AppWindow.c"
+#line 2857 "AppWindow.c"
}
static void _app_window_on_help_contents_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_help_contents ((AppWindow*) self);
-#line 2859 "AppWindow.c"
+#line 2864 "AppWindow.c"
}
static void _vala_array_add162 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((*length) == (*size)) {
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
*array = g_renew (GtkActionEntry, *array, *size);
-#line 2870 "AppWindow.c"
+#line 2875 "AppWindow.c"
}
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[(*length)++] = *value;
-#line 2874 "AppWindow.c"
+#line 2879 "AppWindow.c"
}
static void _app_window_on_help_faq_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_help_faq ((AppWindow*) self);
-#line 2881 "AppWindow.c"
+#line 2886 "AppWindow.c"
}
static void _vala_array_add163 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((*length) == (*size)) {
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
*array = g_renew (GtkActionEntry, *array, *size);
-#line 2892 "AppWindow.c"
+#line 2897 "AppWindow.c"
}
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[(*length)++] = *value;
-#line 2896 "AppWindow.c"
+#line 2901 "AppWindow.c"
}
static void _app_window_on_help_report_problem_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_help_report_problem ((AppWindow*) self);
-#line 2903 "AppWindow.c"
+#line 2908 "AppWindow.c"
}
static void _vala_array_add164 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((*length) == (*size)) {
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
*array = g_renew (GtkActionEntry, *array, *size);
-#line 2914 "AppWindow.c"
+#line 2919 "AppWindow.c"
}
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[(*length)++] = *value;
-#line 2918 "AppWindow.c"
+#line 2923 "AppWindow.c"
}
static void _app_window_on_undo_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_undo ((AppWindow*) self);
-#line 2925 "AppWindow.c"
+#line 2930 "AppWindow.c"
}
static void _vala_array_add165 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((*length) == (*size)) {
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
*array = g_renew (GtkActionEntry, *array, *size);
-#line 2936 "AppWindow.c"
+#line 2941 "AppWindow.c"
}
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[(*length)++] = *value;
-#line 2940 "AppWindow.c"
+#line 2945 "AppWindow.c"
}
static void _app_window_on_redo_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_redo ((AppWindow*) self);
-#line 2947 "AppWindow.c"
+#line 2952 "AppWindow.c"
}
static void _vala_array_add166 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((*length) == (*size)) {
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
*array = g_renew (GtkActionEntry, *array, *size);
-#line 2958 "AppWindow.c"
+#line 2963 "AppWindow.c"
}
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[(*length)++] = *value;
-#line 2962 "AppWindow.c"
+#line 2967 "AppWindow.c"
}
static void _app_window_on_jump_to_file_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_jump_to_file ((AppWindow*) self);
-#line 2969 "AppWindow.c"
+#line 2974 "AppWindow.c"
}
static void _vala_array_add167 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((*length) == (*size)) {
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
*array = g_renew (GtkActionEntry, *array, *size);
-#line 2980 "AppWindow.c"
+#line 2985 "AppWindow.c"
}
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[(*length)++] = *value;
-#line 2984 "AppWindow.c"
+#line 2989 "AppWindow.c"
}
static void _app_window_on_select_all_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 524 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_select_all ((AppWindow*) self);
-#line 2991 "AppWindow.c"
+#line 2996 "AppWindow.c"
}
static void _vala_array_add168 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((*length) == (*size)) {
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
*array = g_renew (GtkActionEntry, *array, *size);
-#line 3002 "AppWindow.c"
+#line 3007 "AppWindow.c"
}
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[(*length)++] = *value;
-#line 3006 "AppWindow.c"
+#line 3011 "AppWindow.c"
}
static void _app_window_on_select_none_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_select_none ((AppWindow*) self);
-#line 3013 "AppWindow.c"
+#line 3018 "AppWindow.c"
}
static void _vala_array_add169 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((*length) == (*size)) {
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
*array = g_renew (GtkActionEntry, *array, *size);
-#line 3024 "AppWindow.c"
+#line 3029 "AppWindow.c"
}
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[(*length)++] = *value;
-#line 3028 "AppWindow.c"
+#line 3033 "AppWindow.c"
}
@@ -3125,330 +3127,330 @@ static GtkActionEntry* app_window_create_common_actions (AppWindow* self, int* r
GtkActionEntry _tmp36_ = {0};
GtkActionEntry* _tmp37_ = NULL;
gint _tmp37__length1 = 0;
-#line 476 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = g_new0 (GtkActionEntry, 0);
-#line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
actions = _tmp0_;
-#line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
actions_length1 = 0;
-#line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
_actions_size_ = actions_length1;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_.name = "CommonQuit";
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_.stock_id = RESOURCES_QUIT_LABEL;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_.label = TRANSLATABLE;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_.accelerator = "<Ctrl>Q";
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_.tooltip = TRANSLATABLE;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_.callback = (GCallback) _app_window_on_quit_gtk_action_callback;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
quit = _tmp1_;
-#line 481 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/AppWindow.vala"
quit.label = RESOURCES_QUIT_LABEL;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = actions;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2__length1 = actions_length1;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = quit;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_array_add159 (&actions, &actions_length1, &_actions_size_, &_tmp3_);
-#line 484 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_.name = "CommonAbout";
-#line 484 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_.stock_id = RESOURCES_ABOUT_LABEL;
-#line 484 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_.label = TRANSLATABLE;
-#line 484 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_.accelerator = NULL;
-#line 484 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_.tooltip = TRANSLATABLE;
-#line 484 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_.callback = (GCallback) _app_window_on_about_gtk_action_callback;
-#line 484 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
about = _tmp4_;
-#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 489 "/home/jens/Source/shotwell/src/AppWindow.vala"
about.label = RESOURCES_ABOUT_LABEL;
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = actions;
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5__length1 = actions_length1;
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = about;
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_array_add160 (&actions, &actions_length1, &_actions_size_, &_tmp6_);
-#line 489 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_.name = "CommonFullscreen";
-#line 489 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_.stock_id = RESOURCES_FULLSCREEN_LABEL;
-#line 489 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_.label = TRANSLATABLE;
-#line 489 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_.accelerator = "F11";
-#line 489 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_.tooltip = TRANSLATABLE;
-#line 489 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_.callback = (GCallback) _app_window_on_fullscreen_gtk_action_callback;
-#line 489 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
fullscreen = _tmp7_;
-#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
fullscreen.label = RESOURCES_FULLSCREEN_LABEL;
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = actions;
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8__length1 = actions_length1;
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = fullscreen;
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_array_add161 (&actions, &actions_length1, &_actions_size_, &_tmp9_);
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_.name = "CommonHelpContents";
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_.stock_id = RESOURCES_HELP_LABEL;
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_.label = TRANSLATABLE;
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_.accelerator = "F1";
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_.tooltip = TRANSLATABLE;
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_.callback = (GCallback) _app_window_on_help_contents_gtk_action_callback;
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
help_contents = _tmp10_;
-#line 496 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = _ ("_Contents");
-#line 496 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
help_contents.label = _tmp11_;
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = actions;
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12__length1 = actions_length1;
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = help_contents;
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_array_add162 (&actions, &actions_length1, &_actions_size_, &_tmp13_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_.name = "CommonHelpFAQ";
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_.stock_id = NULL;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_.label = TRANSLATABLE;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_.accelerator = NULL;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_.tooltip = TRANSLATABLE;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_.callback = (GCallback) _app_window_on_help_faq_gtk_action_callback;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
help_faq = _tmp14_;
-#line 501 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = _ ("_Frequently Asked Questions");
-#line 501 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
help_faq.label = _tmp15_;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16_ = actions;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16__length1 = actions_length1;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp17_ = help_faq;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_array_add163 (&actions, &actions_length1, &_actions_size_, &_tmp17_);
-#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_.name = "CommonHelpReportProblem";
-#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_.stock_id = NULL;
-#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_.label = TRANSLATABLE;
-#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_.accelerator = NULL;
-#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_.tooltip = TRANSLATABLE;
-#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_.callback = (GCallback) _app_window_on_help_report_problem_gtk_action_callback;
-#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
help_report_problem = _tmp18_;
-#line 506 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp19_ = _ ("_Report a Problem...");
-#line 506 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
help_report_problem.label = _tmp19_;
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp20_ = actions;
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp20__length1 = actions_length1;
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp21_ = help_report_problem;
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_array_add164 (&actions, &actions_length1, &_actions_size_, &_tmp21_);
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp22_.name = "CommonUndo";
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp22_.stock_id = RESOURCES_UNDO_MENU;
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp22_.label = TRANSLATABLE;
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp22_.accelerator = "<Ctrl>Z";
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp22_.tooltip = TRANSLATABLE;
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp22_.callback = (GCallback) _app_window_on_undo_gtk_action_callback;
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
undo = _tmp22_;
-#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
undo.label = RESOURCES_UNDO_MENU;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp23_ = actions;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp23__length1 = actions_length1;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp24_ = undo;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_array_add165 (&actions, &actions_length1, &_actions_size_, &_tmp24_);
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp25_.name = "CommonRedo";
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp25_.stock_id = RESOURCES_REDO_MENU;
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp25_.label = TRANSLATABLE;
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp25_.accelerator = "<Ctrl><Shift>Z";
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp25_.tooltip = TRANSLATABLE;
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp25_.callback = (GCallback) _app_window_on_redo_gtk_action_callback;
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
redo = _tmp25_;
-#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
redo.label = RESOURCES_REDO_MENU;
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp26_ = actions;
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp26__length1 = actions_length1;
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp27_ = redo;
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_array_add166 (&actions, &actions_length1, &_actions_size_, &_tmp27_);
-#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp28_.name = "CommonJumpToFile";
-#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp28_.stock_id = RESOURCES_JUMP_TO_FILE_MENU;
-#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp28_.label = TRANSLATABLE;
-#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp28_.accelerator = "<Ctrl><Shift>M";
-#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp28_.tooltip = TRANSLATABLE;
-#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp28_.callback = (GCallback) _app_window_on_jump_to_file_gtk_action_callback;
-#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
jump_to_file = _tmp28_;
-#line 521 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 524 "/home/jens/Source/shotwell/src/AppWindow.vala"
jump_to_file.label = RESOURCES_JUMP_TO_FILE_MENU;
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp29_ = actions;
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp29__length1 = actions_length1;
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp30_ = jump_to_file;
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_array_add167 (&actions, &actions_length1, &_actions_size_, &_tmp30_);
-#line 524 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp31_.name = "CommonSelectAll";
-#line 524 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp31_.stock_id = RESOURCES_SELECT_ALL_MENU;
-#line 524 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp31_.label = TRANSLATABLE;
-#line 524 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp31_.accelerator = "<Ctrl>A";
-#line 524 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp31_.tooltip = TRANSLATABLE;
-#line 524 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp31_.callback = (GCallback) _app_window_on_select_all_gtk_action_callback;
-#line 524 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
select_all = _tmp31_;
-#line 526 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
select_all.label = RESOURCES_SELECT_ALL_MENU;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp32_ = actions;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp32__length1 = actions_length1;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp33_ = select_all;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_array_add168 (&actions, &actions_length1, &_actions_size_, &_tmp33_);
-#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp34_.name = "CommonSelectNone";
-#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp34_.stock_id = NULL;
-#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp34_.label = NULL;
-#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp34_.accelerator = "<Ctrl><Shift>A";
-#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp34_.tooltip = TRANSLATABLE;
-#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp34_.callback = (GCallback) _app_window_on_select_none_gtk_action_callback;
-#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
select_none = _tmp34_;
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp35_ = actions;
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp35__length1 = actions_length1;
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp36_ = select_none;
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_array_add169 (&actions, &actions_length1, &_actions_size_, &_tmp36_);
-#line 533 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp37_ = actions;
-#line 533 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp37__length1 = actions_length1;
-#line 533 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (result_length1) {
-#line 533 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
*result_length1 = _tmp37__length1;
-#line 3384 "AppWindow.c"
+#line 3389 "AppWindow.c"
}
-#line 533 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp37_;
-#line 533 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 3390 "AppWindow.c"
+#line 3395 "AppWindow.c"
}
static void app_window_real_on_fullscreen (AppWindow* self) {
-#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_critical ("Type `%s' does not implement abstract method `app_window_on_fullscreen'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 3399 "AppWindow.c"
+#line 3404 "AppWindow.c"
}
void app_window_on_fullscreen (AppWindow* self) {
-#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
APP_WINDOW_GET_CLASS (self)->on_fullscreen (self);
-#line 3408 "AppWindow.c"
+#line 3413 "AppWindow.c"
}
gboolean app_window_has_instance (void) {
gboolean result = FALSE;
AppWindow* _tmp0_ = NULL;
-#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_instance;
-#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp0_ != NULL;
-#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 3421 "AppWindow.c"
+#line 3426 "AppWindow.c"
}
@@ -3456,15 +3458,15 @@ AppWindow* app_window_get_instance (void) {
AppWindow* result = NULL;
AppWindow* _tmp0_ = NULL;
AppWindow* _tmp1_ = NULL;
-#line 543 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_instance;
-#line 543 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 543 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp1_;
-#line 543 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 3437 "AppWindow.c"
+#line 3442 "AppWindow.c"
}
@@ -3472,15 +3474,15 @@ FullscreenWindow* app_window_get_fullscreen (void) {
FullscreenWindow* result = NULL;
FullscreenWindow* _tmp0_ = NULL;
FullscreenWindow* _tmp1_ = NULL;
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_fullscreen_window;
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp1_;
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 3453 "AppWindow.c"
+#line 3458 "AppWindow.c"
}
@@ -3490,13 +3492,13 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
GtkBuilder* _tmp0_ = NULL;
void* _tmp12_ = NULL;
GError * _inner_error_ = NULL;
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (glade_filename != NULL, NULL);
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 554 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = gtk_builder_new ();
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 554 "/home/jens/Source/shotwell/src/AppWindow.vala"
builder = _tmp0_;
-#line 3469 "AppWindow.c"
+#line 3474 "AppWindow.c"
{
GFile* _tmp1_ = NULL;
GFile* _tmp2_ = NULL;
@@ -3507,37 +3509,37 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
GFile* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = app_dirs_get_resources_dir ();
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = _tmp1_;
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = g_file_get_child (_tmp2_, "ui");
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = _tmp3_;
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = glade_filename;
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = g_file_get_child (_tmp4_, _tmp5_);
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = _tmp6_;
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = g_file_get_path (_tmp7_);
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = _tmp8_;
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_builder_add_from_file (builder, _tmp9_, &_inner_error_);
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp9_);
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp7_);
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp4_);
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp2_);
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3510 "AppWindow.c"
+#line 3515 "AppWindow.c"
goto __catch214_g_error;
}
}
@@ -3547,59 +3549,59 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
GError* _error_ = NULL;
GError* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
_error_ = _inner_error_;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
_inner_error_ = NULL;
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = _error_;
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = _tmp10_->message;
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
- g_warning ("AppWindow.vala:556: Unable to create Gtk.Builder: %s\n", _tmp11_);
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ g_warning ("AppWindow.vala:559: Unable to create Gtk.Builder: %s\n", _tmp11_);
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_error_free0 (_error_);
-#line 3532 "AppWindow.c"
+#line 3537 "AppWindow.c"
}
__finally214:
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (builder);
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_clear_error (&_inner_error_);
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
return NULL;
-#line 3545 "AppWindow.c"
+#line 3550 "AppWindow.c"
}
-#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = user;
-#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_builder_connect_signals (builder, _tmp12_);
-#line 561 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 564 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = builder;
-#line 561 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 564 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 3555 "AppWindow.c"
+#line 3560 "AppWindow.c"
}
void app_window_error_message (const gchar* message, GtkWindow* parent) {
const gchar* _tmp0_ = NULL;
GtkWindow* _tmp1_ = NULL;
-#line 564 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (message != NULL);
-#line 564 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent));
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = message;
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = parent;
-#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_error_message_with_title (RESOURCES_APP_TITLE, _tmp0_, _tmp1_, TRUE);
-#line 3572 "AppWindow.c"
+#line 3577 "AppWindow.c"
}
@@ -3619,83 +3621,83 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
gboolean _tmp14_ = FALSE;
gchar* _tmp15_ = NULL;
gchar* _tmp16_ = NULL;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (title != NULL);
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (message != NULL);
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent));
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = parent;
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 3602 "AppWindow.c"
+#line 3607 "AppWindow.c"
GtkWindow* _tmp2_ = NULL;
GtkWindow* _tmp3_ = NULL;
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = parent;
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp3_;
-#line 3613 "AppWindow.c"
+#line 3618 "AppWindow.c"
} else {
AppWindow* _tmp4_ = NULL;
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = app_window_get_instance ();
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3622 "AppWindow.c"
+#line 3627 "AppWindow.c"
}
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = title;
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = message;
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = should_escape;
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = build_alert_body_text (_tmp5_, _tmp6_, _tmp7_);
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = _tmp8_;
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp9_);
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_object_ref_sink (_tmp10_);
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = _tmp10_;
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp9_);
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
dialog = _tmp11_;
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = title;
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = message;
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_ = should_escape;
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = build_alert_body_text (_tmp12_, _tmp13_, _tmp14_);
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16_ = _tmp15_;
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_message_dialog_set_markup (dialog, _tmp16_);
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp16_);
-#line 578 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_object_set (dialog, "use-markup", TRUE, NULL);
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 583 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (dialog);
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 3668 "AppWindow.c"
+#line 3673 "AppWindow.c"
}
@@ -3718,93 +3720,93 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
const gchar* _tmp16_ = NULL;
gboolean response = FALSE;
gint _tmp17_ = 0;
-#line 583 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (message != NULL, FALSE);
-#line 583 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (negative != NULL, FALSE);
-#line 583 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (affirmative != NULL, FALSE);
-#line 583 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), FALSE);
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = parent;
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 3703 "AppWindow.c"
+#line 3708 "AppWindow.c"
GtkWindow* _tmp2_ = NULL;
GtkWindow* _tmp3_ = NULL;
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = parent;
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp3_;
-#line 3714 "AppWindow.c"
+#line 3719 "AppWindow.c"
} else {
AppWindow* _tmp4_ = NULL;
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = app_window_get_instance ();
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3723 "AppWindow.c"
+#line 3728 "AppWindow.c"
}
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = title;
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = message;
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = _tmp7_;
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp8_);
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_object_ref_sink (_tmp9_);
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = _tmp9_;
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp8_);
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
- dialog = _tmp10_;
#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ dialog = _tmp10_;
+#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = title;
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = message;
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = build_alert_body_text (_tmp11_, _tmp12_, TRUE);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_ = _tmp13_;
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_message_dialog_set_markup (dialog, _tmp14_);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp14_);
-#line 589 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = negative;
-#line 589 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16_ = affirmative;
-#line 589 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_NO, _tmp16_, GTK_RESPONSE_YES, NULL);
-#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_set_urgency_hint (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), TRUE);
-#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/AppWindow.vala"
response = _tmp17_ == ((gint) GTK_RESPONSE_YES);
-#line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 596 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = response;
-#line 596 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (dialog);
-#line 596 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 596 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 3777 "AppWindow.c"
+#line 3782 "AppWindow.c"
}
@@ -3828,95 +3830,95 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
gchar* _tmp17_ = NULL;
gint response = 0;
gint _tmp18_ = 0;
-#line 599 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 602 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (message != NULL, 0);
-#line 599 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 602 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (negative != NULL, 0);
-#line 599 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 602 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (affirmative != NULL, 0);
-#line 599 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 602 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = parent;
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 3813 "AppWindow.c"
+#line 3818 "AppWindow.c"
GtkWindow* _tmp2_ = NULL;
GtkWindow* _tmp3_ = NULL;
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = parent;
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp3_;
-#line 3824 "AppWindow.c"
+#line 3829 "AppWindow.c"
} else {
AppWindow* _tmp4_ = NULL;
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = app_window_get_instance ();
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3833 "AppWindow.c"
+#line 3838 "AppWindow.c"
}
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = title;
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = message;
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = _tmp7_;
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp8_);
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_object_ref_sink (_tmp9_);
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = _tmp9_;
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp8_);
-#line 601 "/home/jens/Source/shotwell/src/AppWindow.vala"
- dialog = _tmp10_;
#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ dialog = _tmp10_;
+#line 607 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = negative;
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 607 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = affirmative;
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 607 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = _ ("_Cancel");
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 607 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp11_, GTK_RESPONSE_NO, _tmp12_, GTK_RESPONSE_YES, _tmp13_, GTK_RESPONSE_CANCEL, NULL);
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_ = title;
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = message;
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16_ = build_alert_body_text (_tmp14_, _tmp15_, TRUE);
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp17_ = _tmp16_;
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_message_dialog_set_markup (dialog, _tmp17_);
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp17_);
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_object_set (dialog, "use-markup", TRUE, NULL);
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
response = _tmp18_;
-#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 615 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = (GtkResponseType) response;
-#line 615 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (dialog);
-#line 615 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 615 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 3889 "AppWindow.c"
+#line 3894 "AppWindow.c"
}
@@ -3940,103 +3942,103 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
GtkMessageDialog* _tmp17_ = NULL;
gint _tmp18_ = 0;
GtkMessageDialog* _tmp19_ = NULL;
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (message != NULL, 0);
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (affirmative != NULL, 0);
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = parent;
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 3923 "AppWindow.c"
+#line 3928 "AppWindow.c"
GtkWindow* _tmp2_ = NULL;
GtkWindow* _tmp3_ = NULL;
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = parent;
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp3_;
-#line 3934 "AppWindow.c"
+#line 3939 "AppWindow.c"
} else {
AppWindow* _tmp4_ = NULL;
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = app_window_get_instance ();
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3943 "AppWindow.c"
+#line 3948 "AppWindow.c"
}
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = message;
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp5_);
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_object_ref_sink (_tmp6_);
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
- dialog = _tmp6_;
#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ dialog = _tmp6_;
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = dialog;
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = message;
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_message_dialog_set_markup (_tmp7_, _tmp8_);
-#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = dialog;
-#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_object_set (_tmp9_, "use-markup", TRUE, NULL);
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = title;
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp11_ != NULL) {
-#line 3967 "AppWindow.c"
+#line 3972 "AppWindow.c"
const gchar* _tmp12_ = NULL;
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = title;
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = _tmp12_;
-#line 3973 "AppWindow.c"
+#line 3978 "AppWindow.c"
} else {
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = RESOURCES_APP_TITLE;
-#line 3977 "AppWindow.c"
+#line 3982 "AppWindow.c"
}
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = dialog;
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_window_get_type (), GtkWindow), _tmp10_);
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_ = dialog;
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = affirmative;
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16_ = _ ("_Cancel");
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_YES, _tmp16_, GTK_RESPONSE_CANCEL, NULL);
#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_YES, _tmp16_, GTK_RESPONSE_CANCEL, NULL);
+#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp17_ = dialog;
-#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_dialog_get_type (), GtkDialog));
-#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
response = _tmp18_;
-#line 631 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp19_ = dialog;
-#line 631 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = (GtkResponseType) response;
-#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (dialog);
-#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 4009 "AppWindow.c"
+#line 4014 "AppWindow.c"
}
@@ -4059,101 +4061,101 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
GtkMessageDialog* _tmp16_ = NULL;
gint _tmp17_ = 0;
GtkMessageDialog* _tmp18_ = NULL;
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (message != NULL, 0);
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (negative != NULL, 0);
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (affirmative != NULL, 0);
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (affirmative_all != NULL, 0);
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
- g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = parent;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 4046 "AppWindow.c"
+#line 4051 "AppWindow.c"
GtkWindow* _tmp2_ = NULL;
GtkWindow* _tmp3_ = NULL;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = parent;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _tmp3_;
-#line 4057 "AppWindow.c"
+#line 4062 "AppWindow.c"
} else {
AppWindow* _tmp4_ = NULL;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = app_window_get_instance ();
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 4066 "AppWindow.c"
+#line 4071 "AppWindow.c"
}
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = message;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp5_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_object_ref_sink (_tmp6_);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
dialog = _tmp6_;
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = title;
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp8_ != NULL) {
-#line 4080 "AppWindow.c"
+#line 4085 "AppWindow.c"
const gchar* _tmp9_ = NULL;
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = title;
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = _tmp9_;
-#line 4086 "AppWindow.c"
+#line 4091 "AppWindow.c"
} else {
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = RESOURCES_APP_TITLE;
-#line 4090 "AppWindow.c"
+#line 4095 "AppWindow.c"
}
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = dialog;
-#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), _tmp7_);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = dialog;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = negative;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = affirmative;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_ = affirmative_all;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = _ ("_Cancel");
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
- gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_dialog_get_type (), GtkDialog), _tmp12_, GTK_RESPONSE_NO, _tmp13_, GTK_RESPONSE_YES, _tmp14_, GTK_RESPONSE_APPLY, _tmp15_, GTK_RESPONSE_CANCEL, NULL);
#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_dialog_get_type (), GtkDialog), _tmp12_, GTK_RESPONSE_NO, _tmp13_, GTK_RESPONSE_YES, _tmp14_, GTK_RESPONSE_APPLY, _tmp15_, GTK_RESPONSE_CANCEL, NULL);
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16_ = dialog;
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_dialog_get_type (), GtkDialog));
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
response = _tmp17_;
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_ = dialog;
-#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 652 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = (GtkResponseType) response;
-#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 652 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (dialog);
-#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 652 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 652 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 4126 "AppWindow.c"
+#line 4131 "AppWindow.c"
}
@@ -4163,24 +4165,24 @@ void app_window_database_error (GError* err) {
const gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _ ("A fatal error occurred when accessing Shotwell's library. Shotwell ca" \
"nnot continue.\n" \
"\n" \
"%s");
-#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = err;
-#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = _tmp1_->message;
-#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = _tmp3_;
-#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_panic (_tmp4_);
-#line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp4_);
-#line 4150 "AppWindow.c"
+#line 4155 "AppWindow.c"
}
@@ -4189,43 +4191,43 @@ void app_window_panic (const gchar* msg) {
const gchar* _tmp1_ = NULL;
Application* _tmp2_ = NULL;
Application* _tmp3_ = NULL;
-#line 657 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 660 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (msg != NULL);
-#line 658 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = msg;
-#line 658 "/home/jens/Source/shotwell/src/AppWindow.vala"
- g_critical ("AppWindow.vala:658: %s", _tmp0_);
-#line 659 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ g_critical ("AppWindow.vala:661: %s", _tmp0_);
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = msg;
-#line 659 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_error_message (_tmp1_, NULL);
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = application_get_instance ();
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _tmp2_;
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
application_panic (_tmp3_);
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
_application_unref0 (_tmp3_);
-#line 4177 "AppWindow.c"
+#line 4182 "AppWindow.c"
}
static gchar* app_window_real_get_app_role (AppWindow* self) {
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_critical ("Type `%s' does not implement abstract method `app_window_get_app_role'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
return NULL;
-#line 4186 "AppWindow.c"
+#line 4191 "AppWindow.c"
}
gchar* app_window_get_app_role (AppWindow* self) {
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
return APP_WINDOW_GET_CLASS (self)->get_app_role (self);
-#line 4195 "AppWindow.c"
+#line 4200 "AppWindow.c"
}
@@ -4236,44 +4238,44 @@ void app_window_on_about (AppWindow* self) {
GdkPixbuf* _tmp3_ = NULL;
GdkPixbuf* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_get_app_role (self);
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _tmp0_;
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = _ ("Visit the Shotwell web site");
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = resources_get_icon (RESOURCES_ICON_ABOUT_LOGO, -1);
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = _tmp3_;
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _ ("translator-credits");
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_show_about_dialog (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), "version", RESOURCES_APP_VERSION, "comments", _tmp1_, "copyright", RESOURCES_COPYRIGHT, "website", RESOURCES_HOME_URL, "license", RESOURCES_LICENSE, "website-label", _tmp2_, "authors", RESOURCES_AUTHORS, "logo", _tmp4_, "translator-credits", _tmp5_, NULL, NULL);
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp4_);
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp1_);
-#line 4226 "AppWindow.c"
+#line 4231 "AppWindow.c"
}
static void app_window_on_help_contents (AppWindow* self) {
GError * _inner_error_ = NULL;
-#line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 684 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 4234 "AppWindow.c"
+#line 4239 "AppWindow.c"
{
GdkScreen* _tmp0_ = NULL;
-#line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
resources_launch_help (_tmp0_, NULL, &_inner_error_);
-#line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4243 "AppWindow.c"
+#line 4248 "AppWindow.c"
goto __catch215_g_error;
}
}
@@ -4286,53 +4288,53 @@ static void app_window_on_help_contents (AppWindow* self) {
const gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
-#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
err = _inner_error_;
-#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _inner_error_ = NULL;
#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ _inner_error_ = NULL;
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _ ("Unable to display help: %s");
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = err;
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _tmp2_->message;
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = g_strdup_printf (_tmp1_, _tmp3_);
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _tmp4_;
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_error_message (_tmp5_, NULL);
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp5_);
-#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_error_free0 (err);
-#line 4276 "AppWindow.c"
+#line 4281 "AppWindow.c"
}
__finally215:
-#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_clear_error (&_inner_error_);
-#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 4287 "AppWindow.c"
+#line 4292 "AppWindow.c"
}
}
static void app_window_on_help_report_problem (AppWindow* self) {
GError * _inner_error_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 4296 "AppWindow.c"
+#line 4301 "AppWindow.c"
{
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_show_uri (self, RESOURCES_BUG_DB_URL, &_inner_error_);
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4302 "AppWindow.c"
+#line 4307 "AppWindow.c"
goto __catch216_g_error;
}
}
@@ -4345,53 +4347,53 @@ static void app_window_on_help_report_problem (AppWindow* self) {
const gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
err = _inner_error_;
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _inner_error_ = NULL;
#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ _inner_error_ = NULL;
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _ ("Unable to navigate to bug database: %s");
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = err;
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = _tmp1_->message;
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = _tmp3_;
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_error_message (_tmp4_, NULL);
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp4_);
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_error_free0 (err);
-#line 4335 "AppWindow.c"
+#line 4340 "AppWindow.c"
}
__finally216:
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_clear_error (&_inner_error_);
-#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 4346 "AppWindow.c"
+#line 4351 "AppWindow.c"
}
}
static void app_window_on_help_faq (AppWindow* self) {
GError * _inner_error_ = NULL;
-#line 697 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 4355 "AppWindow.c"
+#line 4360 "AppWindow.c"
{
-#line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_show_uri (self, RESOURCES_FAQ_URL, &_inner_error_);
-#line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4361 "AppWindow.c"
+#line 4366 "AppWindow.c"
goto __catch217_g_error;
}
}
@@ -4404,38 +4406,38 @@ static void app_window_on_help_faq (AppWindow* self) {
const gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
-#line 698 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
err = _inner_error_;
-#line 698 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _inner_error_ = NULL;
#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ _inner_error_ = NULL;
+#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _ ("Unable to display FAQ: %s");
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = err;
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = _tmp1_->message;
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = _tmp3_;
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_error_message (_tmp4_, NULL);
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp4_);
-#line 698 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_error_free0 (err);
-#line 4394 "AppWindow.c"
+#line 4399 "AppWindow.c"
}
__finally217:
-#line 698 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 698 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 698 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_clear_error (&_inner_error_);
-#line 698 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 4405 "AppWindow.c"
+#line 4410 "AppWindow.c"
}
}
@@ -4443,24 +4445,24 @@ static void app_window_on_help_faq (AppWindow* self) {
static void app_window_real_on_quit (AppWindow* self) {
Application* _tmp0_ = NULL;
Application* _tmp1_ = NULL;
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = application_get_instance ();
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _tmp0_;
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
application_exit (_tmp1_);
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
_application_unref0 (_tmp1_);
-#line 4421 "AppWindow.c"
+#line 4426 "AppWindow.c"
}
void app_window_on_quit (AppWindow* self) {
-#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
APP_WINDOW_GET_CLASS (self)->on_quit (self);
-#line 4430 "AppWindow.c"
+#line 4435 "AppWindow.c"
}
@@ -4483,71 +4485,71 @@ void app_window_on_jump_to_file (AppWindow* self) {
MediaSource* _tmp14_ = NULL;
MediaSource* _tmp15_ = NULL;
GError * _inner_error_ = NULL;
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _tmp0_;
-#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = page_get_view (_tmp1_);
-#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _tmp2_;
-#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _tmp4_ != 1;
-#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp3_);
-#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp1_);
-#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp5_) {
-#line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 4475 "AppWindow.c"
+#line 4480 "AppWindow.c"
}
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = _tmp6_;
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = page_get_view (_tmp7_);
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = _tmp8_;
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = view_collection_get_selected_at (_tmp9_, 0);
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = _tmp10_;
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = data_view_get_source (_tmp11_);
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp12_) : NULL;
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp13_ == NULL) {
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp12_);
-#line 4497 "AppWindow.c"
+#line 4502 "AppWindow.c"
}
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_ = _tmp13_;
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp11_);
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp9_);
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp7_);
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
media = _tmp14_;
-#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = media;
-#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp15_ == NULL) {
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (media);
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 4517 "AppWindow.c"
+#line 4522 "AppWindow.c"
}
{
AppWindow* _tmp16_ = NULL;
@@ -4555,25 +4557,25 @@ void app_window_on_jump_to_file (AppWindow* self) {
MediaSource* _tmp18_ = NULL;
GFile* _tmp19_ = NULL;
GFile* _tmp20_ = NULL;
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16_ = app_window_get_instance ();
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp17_ = _tmp16_;
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_ = media;
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp19_ = media_source_get_master_file (_tmp18_);
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp20_ = _tmp19_;
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_show_file_uri (_tmp17_, _tmp20_, &_inner_error_);
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp20_);
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp17_);
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4543 "AppWindow.c"
+#line 4548 "AppWindow.c"
goto __catch218_g_error;
}
}
@@ -4584,63 +4586,63 @@ void app_window_on_jump_to_file (AppWindow* self) {
GError* _tmp21_ = NULL;
gchar* _tmp22_ = NULL;
gchar* _tmp23_ = NULL;
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
err = _inner_error_;
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
- _inner_error_ = NULL;
#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ _inner_error_ = NULL;
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp21_ = err;
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp22_ = resources_jump_to_file_failed (_tmp21_);
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp23_ = _tmp22_;
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_error_message (_tmp23_, NULL);
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp23_);
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_error_free0 (err);
-#line 4570 "AppWindow.c"
+#line 4575 "AppWindow.c"
}
__finally218:
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (media);
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_clear_error (&_inner_error_);
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 4583 "AppWindow.c"
+#line 4588 "AppWindow.c"
}
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (media);
-#line 4587 "AppWindow.c"
+#line 4592 "AppWindow.c"
}
static void app_window_real_destroy (GtkWidget* base) {
AppWindow * self;
-#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_quit (self);
-#line 4597 "AppWindow.c"
+#line 4602 "AppWindow.c"
}
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 4610 "AppWindow.c"
+#line 4615 "AppWindow.c"
{
GRegex* regex = NULL;
const gchar* _tmp0_ = NULL;
@@ -4653,100 +4655,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4641 "AppWindow.c"
+#line 4646 "AppWindow.c"
goto __catch219_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 4650 "AppWindow.c"
+#line 4655 "AppWindow.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4666 "AppWindow.c"
+#line 4671 "AppWindow.c"
goto __catch219_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 4677 "AppWindow.c"
+#line 4682 "AppWindow.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 4691 "AppWindow.c"
+#line 4696 "AppWindow.c"
}
goto __finally219;
__catch219_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 4705 "AppWindow.c"
+#line 4710 "AppWindow.c"
}
__finally219:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 4716 "AppWindow.c"
+#line 4721 "AppWindow.c"
}
}
@@ -4757,53 +4759,53 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
gchar* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
GError * _inner_error_ = NULL;
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (G_IS_FILE (file));
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = get_nautilus_install_location ();
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _tmp0_;
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = _tmp1_ != NULL;
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp1_);
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_) {
-#line 4741 "AppWindow.c"
+#line 4746 "AppWindow.c"
GFile* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
const gchar* _tmp7_ = NULL;
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = file;
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = g_file_get_uri (_tmp3_);
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _tmp4_;
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = string_replace (_tmp5_, "'", "\\\'");
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (tmp);
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
tmp = _tmp6_;
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp5_);
-#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = tmp;
-#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
show_file_in_nautilus (_tmp7_, &_inner_error_);
-#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_propagate_error (error, _inner_error_);
-#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (tmp);
-#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 4773 "AppWindow.c"
+#line 4778 "AppWindow.c"
}
} else {
GFile* _tmp8_ = NULL;
@@ -4813,44 +4815,44 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
gchar* _tmp12_ = NULL;
gchar* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = file;
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = g_file_get_parent (_tmp8_);
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = _tmp9_;
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = g_file_get_uri (_tmp10_);
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = _tmp11_;
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = string_replace (_tmp12_, "'", "\\\'");
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (tmp);
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
tmp = _tmp13_;
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp12_);
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp10_);
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_ = tmp;
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_show_uri (self, _tmp14_, &_inner_error_);
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_propagate_error (error, _inner_error_);
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (tmp);
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 4815 "AppWindow.c"
+#line 4820 "AppWindow.c"
}
}
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (tmp);
-#line 4820 "AppWindow.c"
+#line 4825 "AppWindow.c"
}
@@ -4859,43 +4861,43 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) {
GdkScreen* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
GError * _inner_error_ = NULL;
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (url != NULL);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = gdk_window_get_screen (_tmp0_);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = url;
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
sys_show_uri (_tmp1_, _tmp2_, &_inner_error_);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_propagate_error (error, _inner_error_);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 4847 "AppWindow.c"
+#line 4852 "AppWindow.c"
}
}
static void _vala_array_add170 (GtkActionGroup*** array, int* length, int* size, GtkActionGroup* value) {
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
if ((*length) == (*size)) {
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
*array = g_renew (GtkActionGroup*, *array, (*size) + 1);
-#line 4859 "AppWindow.c"
+#line 4864 "AppWindow.c"
}
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[(*length)++] = value;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
(*array)[*length] = NULL;
-#line 4865 "AppWindow.c"
+#line 4870 "AppWindow.c"
}
@@ -4916,81 +4918,81 @@ static GtkActionGroup** app_window_real_create_common_action_groups (AppWindow*
GtkActionGroup* _tmp7_ = NULL;
GtkActionGroup** _tmp8_ = NULL;
gint _tmp8__length1 = 0;
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = g_new0 (GtkActionGroup*, 0 + 1);
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
groups = _tmp0_;
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
groups_length1 = 0;
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
_groups_size_ = groups_length1;
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = self->priv->common_action_group;
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = app_window_create_common_actions (self, &_tmp2_);
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = _tmp3_;
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4__length1 = _tmp2_;
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_action_group_add_actions (_tmp1_, _tmp4_, _tmp2_, self);
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = (g_free (_tmp4_), NULL);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = groups;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5__length1 = groups_length1;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = self->priv->common_action_group;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
_vala_array_add170 (&groups, &groups_length1, &_groups_size_, _tmp7_);
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = groups;
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8__length1 = groups_length1;
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (result_length1) {
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
*result_length1 = _tmp8__length1;
-#line 4924 "AppWindow.c"
+#line 4929 "AppWindow.c"
}
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp8_;
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 4930 "AppWindow.c"
+#line 4935 "AppWindow.c"
}
GtkActionGroup** app_window_create_common_action_groups (AppWindow* self, int* result_length1) {
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
return APP_WINDOW_GET_CLASS (self)->create_common_action_groups (self, result_length1);
-#line 4939 "AppWindow.c"
+#line 4944 "AppWindow.c"
}
static GtkActionGroup** _vala_array_dup28 (GtkActionGroup** self, int length) {
GtkActionGroup** result;
int i;
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = g_new0 (GtkActionGroup*, length + 1);
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
for (i = 0; i < length; i++) {
-#line 4950 "AppWindow.c"
+#line 4955 "AppWindow.c"
GtkActionGroup* _tmp0_ = NULL;
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = _g_object_ref0 (self[i]);
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
result[i] = _tmp0_;
-#line 4956 "AppWindow.c"
+#line 4961 "AppWindow.c"
}
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 4960 "AppWindow.c"
+#line 4965 "AppWindow.c"
}
@@ -5002,47 +5004,47 @@ GtkActionGroup** app_window_get_common_action_groups (AppWindow* self, int* resu
gint _tmp1__length1 = 0;
GtkActionGroup** _tmp2_ = NULL;
gint _tmp2__length1 = 0;
-#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 759 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->common_action_groups;
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0__length1 = self->common_action_groups_length1;
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup28 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1__length1 = _tmp0__length1;
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = _tmp1_;
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2__length1 = _tmp1__length1;
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (result_length1) {
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
*result_length1 = _tmp2__length1;
-#line 4990 "AppWindow.c"
+#line 4995 "AppWindow.c"
}
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp2_;
-#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 4996 "AppWindow.c"
+#line 5001 "AppWindow.c"
}
static void app_window_real_replace_common_placeholders (AppWindow* self, GtkUIManager* ui) {
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (GTK_IS_UI_MANAGER (ui));
-#line 5003 "AppWindow.c"
+#line 5008 "AppWindow.c"
}
void app_window_replace_common_placeholders (AppWindow* self, GtkUIManager* ui) {
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
APP_WINDOW_GET_CLASS (self)->replace_common_placeholders (self, ui);
-#line 5012 "AppWindow.c"
+#line 5017 "AppWindow.c"
}
@@ -5059,81 +5061,81 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
FullscreenWindow* _tmp12_ = NULL;
FullscreenWindow* _tmp13_ = NULL;
FullscreenWindow* _tmp14_ = NULL;
-#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 766 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 766 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_PAGE (page));
-#line 765 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 768 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_fullscreen_window;
-#line 765 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 768 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_ != NULL) {
-#line 5037 "AppWindow.c"
+#line 5042 "AppWindow.c"
FullscreenWindow* _tmp1_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = app_window_fullscreen_window;
-#line 766 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
-#line 768 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 5045 "AppWindow.c"
+#line 5050 "AppWindow.c"
}
-#line 771 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp2_, &_tmp3_);
-#line 771 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->pos_x = _tmp2_;
-#line 771 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->pos_y = _tmp3_;
-#line 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = page;
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = fullscreen_window_new (_tmp4_);
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_object_ref_sink (_tmp5_);
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
fsw = _tmp5_;
-#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = _tmp6_;
-#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = _tmp7_ != NULL;
-#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp7_);
-#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp8_) {
-#line 5073 "AppWindow.c"
+#line 5078 "AppWindow.c"
Page* _tmp9_ = NULL;
Page* _tmp10_ = NULL;
FullscreenWindow* _tmp11_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = _tmp9_;
-#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = fsw;
-#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
page_switching_to_fullscreen (_tmp10_, _tmp11_);
-#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp10_);
-#line 5087 "AppWindow.c"
+#line 5092 "AppWindow.c"
}
-#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = fsw;
-#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (app_window_fullscreen_window);
-#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_fullscreen_window = _tmp13_;
-#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_ = app_window_fullscreen_window;
-#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 766 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (fsw);
-#line 5103 "AppWindow.c"
+#line 5108 "AppWindow.c"
}
@@ -5146,65 +5148,65 @@ void app_window_end_fullscreen (AppWindow* self) {
gboolean _tmp5_ = FALSE;
FullscreenWindow* _tmp9_ = NULL;
FullscreenWindow* _tmp10_ = NULL;
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_fullscreen_window;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp0_ == NULL) {
-#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 5124 "AppWindow.c"
+#line 5129 "AppWindow.c"
}
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = self->pos_x;
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->pos_y;
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp1_, _tmp2_);
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = _tmp3_;
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _tmp4_ != NULL;
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp4_);
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp5_) {
-#line 5144 "AppWindow.c"
+#line 5149 "AppWindow.c"
Page* _tmp6_ = NULL;
Page* _tmp7_ = NULL;
FullscreenWindow* _tmp8_ = NULL;
-#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = _tmp6_;
-#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = app_window_fullscreen_window;
-#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
page_returning_from_fullscreen (_tmp7_, _tmp8_);
-#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp7_);
-#line 5158 "AppWindow.c"
+#line 5163 "AppWindow.c"
}
-#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = app_window_fullscreen_window;
-#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = app_window_fullscreen_window;
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (app_window_fullscreen_window);
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_fullscreen_window = NULL;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 801 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 5174 "AppWindow.c"
+#line 5179 "AppWindow.c"
}
@@ -5213,34 +5215,34 @@ GtkAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
GtkActionGroup** _tmp0_ = NULL;
gint _tmp0__length1 = 0;
const gchar* _tmp7_ = NULL;
-#line 801 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 801 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (name != NULL, NULL);
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = self->common_action_groups;
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0__length1 = self->common_action_groups_length1;
-#line 5191 "AppWindow.c"
+#line 5196 "AppWindow.c"
{
GtkActionGroup** group_collection = NULL;
gint group_collection_length1 = 0;
gint _group_collection_size_ = 0;
gint group_it = 0;
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
group_collection = _tmp0_;
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
group_collection_length1 = _tmp0__length1;
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
for (group_it = 0; group_it < _tmp0__length1; group_it = group_it + 1) {
-#line 5203 "AppWindow.c"
+#line 5208 "AppWindow.c"
GtkActionGroup* _tmp1_ = NULL;
GtkActionGroup* group = NULL;
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _g_object_ref0 (group_collection[group_it]);
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
group = _tmp1_;
-#line 5210 "AppWindow.c"
+#line 5215 "AppWindow.c"
{
GtkAction* action = NULL;
GtkActionGroup* _tmp2_ = NULL;
@@ -5248,45 +5250,45 @@ GtkAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
GtkAction* _tmp4_ = NULL;
GtkAction* _tmp5_ = NULL;
GtkAction* _tmp6_ = NULL;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = group;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = name;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = gtk_action_group_get_action (_tmp2_, _tmp3_);
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
action = _tmp5_;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = action;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp6_ != NULL) {
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = action;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (group);
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 5238 "AppWindow.c"
+#line 5243 "AppWindow.c"
}
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (action);
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (group);
-#line 5244 "AppWindow.c"
+#line 5249 "AppWindow.c"
}
}
}
-#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = name;
-#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
- g_warning ("AppWindow.vala:808: No common action found: %s", _tmp7_);
-#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+ g_warning ("AppWindow.vala:811: No common action found: %s", _tmp7_);
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = NULL;
-#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 5256 "AppWindow.c"
+#line 5261 "AppWindow.c"
}
@@ -5295,34 +5297,34 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name,
const gchar* _tmp0_ = NULL;
GtkAction* _tmp1_ = NULL;
GtkAction* _tmp2_ = NULL;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (name != NULL);
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = name;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
action = _tmp1_;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = action;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_ != NULL) {
-#line 5279 "AppWindow.c"
+#line 5284 "AppWindow.c"
GtkAction* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = action;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = sensitive;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_action_set_sensitive (_tmp3_, _tmp4_);
-#line 5288 "AppWindow.c"
+#line 5293 "AppWindow.c"
}
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (action);
-#line 5292 "AppWindow.c"
+#line 5297 "AppWindow.c"
}
@@ -5331,34 +5333,34 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
const gchar* _tmp0_ = NULL;
GtkAction* _tmp1_ = NULL;
GtkAction* _tmp2_ = NULL;
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (name != NULL);
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = name;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
action = _tmp1_;
-#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = action;
-#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_ != NULL) {
-#line 5315 "AppWindow.c"
+#line 5320 "AppWindow.c"
GtkAction* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = action;
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = important;
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_action_set_is_important (_tmp3_, _tmp4_);
-#line 5324 "AppWindow.c"
+#line 5329 "AppWindow.c"
}
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (action);
-#line 5328 "AppWindow.c"
+#line 5333 "AppWindow.c"
}
@@ -5367,55 +5369,55 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
const gchar* _tmp0_ = NULL;
GtkAction* _tmp1_ = NULL;
GtkAction* _tmp2_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (name != NULL);
-#line 826 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 829 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = name;
-#line 826 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 829 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 826 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 829 "/home/jens/Source/shotwell/src/AppWindow.vala"
action = _tmp1_;
-#line 827 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = action;
-#line 827 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_ != NULL) {
-#line 5351 "AppWindow.c"
+#line 5356 "AppWindow.c"
GtkAction* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 831 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = action;
-#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 831 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = visible;
-#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 831 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_action_set_visible (_tmp3_, _tmp4_);
-#line 5360 "AppWindow.c"
+#line 5365 "AppWindow.c"
}
-#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (action);
-#line 5364 "AppWindow.c"
+#line 5369 "AppWindow.c"
}
static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_update_common_actions ((AppWindow*) self);
-#line 5371 "AppWindow.c"
+#line 5376 "AppWindow.c"
}
static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
-#line 836 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_update_common_actions ((AppWindow*) self);
-#line 5378 "AppWindow.c"
+#line 5383 "AppWindow.c"
}
static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_on_update_common_actions ((AppWindow*) self);
-#line 5385 "AppWindow.c"
+#line 5390 "AppWindow.c"
}
@@ -5427,23 +5429,23 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
Page* _tmp15_ = NULL;
Page* _tmp34_ = NULL;
Page* _tmp35_ = NULL;
-#line 831 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 831 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 831 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 832 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = old_page;
-#line 832 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = new_page;
-#line 832 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_update_common_action_availability (self, _tmp0_, _tmp1_);
-#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = old_page;
-#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_ != NULL) {
-#line 5413 "AppWindow.c"
+#line 5418 "AppWindow.c"
Page* _tmp3_ = NULL;
ViewCollection* _tmp4_ = NULL;
ViewCollection* _tmp5_ = NULL;
@@ -5456,49 +5458,49 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
ViewCollection* _tmp12_ = NULL;
ViewCollection* _tmp13_ = NULL;
guint _tmp14_ = 0U;
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = old_page;
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = page_get_view (_tmp3_);
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _tmp4_;
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _app_window_on_update_common_actions_data_collection_contents_altered, self);
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp5_);
-#line 836 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = old_page;
-#line 836 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = page_get_view (_tmp7_);
-#line 836 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = _tmp8_;
-#line 836 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE);
-#line 836 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _app_window_on_update_common_actions_view_collection_selection_group_altered, self);
-#line 836 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp9_);
-#line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = old_page;
-#line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = page_get_view (_tmp11_);
-#line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = _tmp12_;
-#line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp14_, NULL, FALSE);
-#line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _app_window_on_update_common_actions_view_collection_items_state_changed, self);
-#line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp13_);
-#line 5462 "AppWindow.c"
+#line 5467 "AppWindow.c"
}
-#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = new_page;
-#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp15_ != NULL) {
-#line 5468 "AppWindow.c"
+#line 5473 "AppWindow.c"
Page* _tmp16_ = NULL;
ViewCollection* _tmp17_ = NULL;
ViewCollection* _tmp18_ = NULL;
@@ -5517,135 +5519,135 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
ViewCollection* _tmp31_ = NULL;
ViewCollection* _tmp32_ = NULL;
gint _tmp33_ = 0;
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16_ = new_page;
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp17_ = page_get_view (_tmp16_);
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_ = _tmp17_;
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _app_window_on_update_common_actions_data_collection_contents_altered, self, 0);
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp18_);
-#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp19_ = new_page;
-#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp20_ = page_get_view (_tmp19_);
-#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp21_ = _tmp20_;
-#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_connect_object (_tmp21_, "selection-group-altered", (GCallback) _app_window_on_update_common_actions_view_collection_selection_group_altered, self, 0);
-#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp21_);
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp22_ = new_page;
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp23_ = page_get_view (_tmp22_);
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp24_ = _tmp23_;
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_signal_connect_object (_tmp24_, "items-state-changed", (GCallback) _app_window_on_update_common_actions_view_collection_items_state_changed, self, 0);
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp24_);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp25_ = new_page;
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp26_ = new_page;
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp27_ = page_get_view (_tmp26_);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp28_ = _tmp27_;
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp29_ = view_collection_get_selected_count (_tmp28_);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp30_ = new_page;
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp31_ = page_get_view (_tmp30_);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp32_ = _tmp31_;
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp33_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_COLLECTION, DataCollection));
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_update_common_actions (self, _tmp25_, _tmp29_, _tmp33_);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp32_);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp28_);
-#line 5541 "AppWindow.c"
+#line 5546 "AppWindow.c"
}
-#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp34_ = old_page;
-#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp35_ = new_page;
-#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
PAGE_WINDOW_CLASS (app_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), _tmp34_, _tmp35_);
-#line 5549 "AppWindow.c"
+#line 5554 "AppWindow.c"
}
static void app_window_real_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) {
gboolean is_checkerboard = FALSE;
Page* _tmp0_ = NULL;
-#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = new_page;
-#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE);
-#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_set_common_action_sensitive (self, "CommonSelectAll", is_checkerboard);
-#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_set_common_action_sensitive (self, "CommonSelectNone", is_checkerboard);
-#line 5568 "AppWindow.c"
+#line 5573 "AppWindow.c"
}
void app_window_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) {
-#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
APP_WINDOW_GET_CLASS (self)->update_common_action_availability (self, old_page, new_page);
-#line 5577 "AppWindow.c"
+#line 5582 "AppWindow.c"
}
static void app_window_real_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) {
Page* _tmp0_ = NULL;
gint _tmp2_ = 0;
-#line 865 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_PAGE (page));
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = page;
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 869 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE)) {
-#line 5590 "AppWindow.c"
+#line 5595 "AppWindow.c"
gint _tmp1_ = 0;
-#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = count;
-#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_set_common_action_sensitive (self, "CommonSelectAll", _tmp1_ > 0);
-#line 5596 "AppWindow.c"
+#line 5601 "AppWindow.c"
}
-#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = selected_count;
-#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 871 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_set_common_action_sensitive (self, "CommonJumpToFile", _tmp2_ == 1);
-#line 870 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 873 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_decorate_undo_action (self);
-#line 871 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_decorate_redo_action (self);
-#line 5606 "AppWindow.c"
+#line 5611 "AppWindow.c"
}
void app_window_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) {
-#line 865 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 865 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
APP_WINDOW_GET_CLASS (self)->update_common_actions (self, page, selected_count, count);
-#line 5615 "AppWindow.c"
+#line 5620 "AppWindow.c"
}
@@ -5653,17 +5655,17 @@ static void app_window_on_update_common_actions (AppWindow* self) {
Page* page = NULL;
Page* _tmp0_ = NULL;
Page* _tmp1_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 875 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 878 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 875 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 878 "/home/jens/Source/shotwell/src/AppWindow.vala"
page = _tmp0_;
-#line 876 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = page;
-#line 876 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ != NULL) {
-#line 5633 "AppWindow.c"
+#line 5638 "AppWindow.c"
Page* _tmp2_ = NULL;
Page* _tmp3_ = NULL;
ViewCollection* _tmp4_ = NULL;
@@ -5673,42 +5675,42 @@ static void app_window_on_update_common_actions (AppWindow* self) {
ViewCollection* _tmp8_ = NULL;
ViewCollection* _tmp9_ = NULL;
gint _tmp10_ = 0;
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = page;
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = page;
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = page_get_view (_tmp3_);
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _tmp4_;
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = page;
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = page_get_view (_tmp7_);
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = _tmp8_;
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection));
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_update_common_actions (self, _tmp2_, _tmp6_, _tmp10_);
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp9_);
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp5_);
-#line 5667 "AppWindow.c"
+#line 5672 "AppWindow.c"
}
-#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (page);
-#line 5671 "AppWindow.c"
+#line 5676 "AppWindow.c"
}
static gpointer _command_manager_ref0 (gpointer self) {
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
return self ? command_manager_ref (self) : NULL;
-#line 5678 "AppWindow.c"
+#line 5683 "AppWindow.c"
}
@@ -5716,26 +5718,26 @@ CommandManager* app_window_get_command_manager (void) {
CommandManager* result = NULL;
CommandManager* _tmp0_ = NULL;
CommandManager* _tmp1_ = NULL;
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_command_manager;
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _command_manager_ref0 (_tmp0_);
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp1_;
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 5694 "AppWindow.c"
+#line 5699 "AppWindow.c"
}
static void app_window_on_command_manager_altered (AppWindow* self) {
-#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_decorate_undo_action (self);
-#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_decorate_redo_action (self);
-#line 5705 "AppWindow.c"
+#line 5710 "AppWindow.c"
}
@@ -5745,37 +5747,37 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
GtkAction* _tmp1_ = NULL;
GtkAction* _tmp2_ = NULL;
CommandDescription* _tmp3_ = NULL;
-#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (name != NULL);
-#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (prefix != NULL);
-#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (default_explanation != NULL);
-#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail ((desc == NULL) || IS_COMMAND_DESCRIPTION (desc));
-#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = name;
-#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
action = _tmp1_;
-#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = action;
-#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_ == NULL) {
-#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (action);
-#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
return;
-#line 5739 "AppWindow.c"
+#line 5744 "AppWindow.c"
}
-#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = desc;
-#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp3_ != NULL) {
-#line 5745 "AppWindow.c"
+#line 5750 "AppWindow.c"
GtkAction* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
CommandDescription* _tmp6_ = NULL;
@@ -5788,70 +5790,70 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
gchar* _tmp13_ = NULL;
gchar* _tmp14_ = NULL;
GtkAction* _tmp15_ = NULL;
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = action;
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = prefix;
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = desc;
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp7_ = command_description_get_name (_tmp6_);
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp8_ = _tmp7_;
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp9_ = g_strdup_printf ("%s %s", _tmp5_, _tmp8_);
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp10_ = _tmp9_;
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_action_set_label (_tmp4_, _tmp10_);
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp10_);
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp8_);
-#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp11_ = action;
-#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp12_ = desc;
-#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp13_ = command_description_get_explanation (_tmp12_);
-#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp14_ = _tmp13_;
-#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_action_set_tooltip (_tmp11_, _tmp14_);
-#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_free0 (_tmp14_);
-#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp15_ = action;
-#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_action_set_sensitive (_tmp15_, TRUE);
-#line 5794 "AppWindow.c"
+#line 5799 "AppWindow.c"
} else {
GtkAction* _tmp16_ = NULL;
const gchar* _tmp17_ = NULL;
GtkAction* _tmp18_ = NULL;
const gchar* _tmp19_ = NULL;
GtkAction* _tmp20_ = NULL;
-#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp16_ = action;
-#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp17_ = prefix;
-#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_action_set_label (_tmp16_, _tmp17_);
-#line 901 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp18_ = action;
-#line 901 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp19_ = default_explanation;
-#line 901 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 904 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_action_set_tooltip (_tmp18_, _tmp19_);
-#line 902 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 905 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp20_ = action;
-#line 902 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 905 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_action_set_sensitive (_tmp20_, FALSE);
-#line 5817 "AppWindow.c"
+#line 5822 "AppWindow.c"
}
-#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (action);
-#line 5821 "AppWindow.c"
+#line 5826 "AppWindow.c"
}
@@ -5860,23 +5862,23 @@ void app_window_decorate_undo_action (AppWindow* self) {
CommandManager* _tmp1_ = NULL;
CommandDescription* _tmp2_ = NULL;
CommandDescription* _tmp3_ = NULL;
-#line 906 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 907 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_get_command_manager ();
-#line 907 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _tmp0_;
-#line 907 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = command_manager_get_undo_description (_tmp1_);
-#line 907 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _tmp2_;
-#line 907 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_decorate_command_manager_action (self, "CommonUndo", RESOURCES_UNDO_MENU, "", _tmp3_);
-#line 907 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp3_);
-#line 907 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
_command_manager_unref0 (_tmp1_);
-#line 5846 "AppWindow.c"
+#line 5851 "AppWindow.c"
}
@@ -5885,47 +5887,47 @@ void app_window_decorate_redo_action (AppWindow* self) {
CommandManager* _tmp1_ = NULL;
CommandDescription* _tmp2_ = NULL;
CommandDescription* _tmp3_ = NULL;
-#line 911 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 914 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 912 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_get_command_manager ();
-#line 912 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = _tmp0_;
-#line 912 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = command_manager_get_redo_description (_tmp1_);
-#line 912 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = _tmp2_;
-#line 912 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_decorate_command_manager_action (self, "CommonRedo", RESOURCES_REDO_MENU, "", _tmp3_);
-#line 912 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp3_);
-#line 912 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
_command_manager_unref0 (_tmp1_);
-#line 5871 "AppWindow.c"
+#line 5876 "AppWindow.c"
}
static void app_window_on_undo (AppWindow* self) {
CommandManager* _tmp0_ = NULL;
-#line 916 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 917 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 920 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_command_manager;
-#line 917 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 920 "/home/jens/Source/shotwell/src/AppWindow.vala"
command_manager_undo (_tmp0_);
-#line 5883 "AppWindow.c"
+#line 5888 "AppWindow.c"
}
static void app_window_on_redo (AppWindow* self) {
CommandManager* _tmp0_ = NULL;
-#line 920 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 921 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = app_window_command_manager;
-#line 921 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/AppWindow.vala"
command_manager_redo (_tmp0_);
-#line 5895 "AppWindow.c"
+#line 5900 "AppWindow.c"
}
@@ -5934,43 +5936,43 @@ static void app_window_on_select_all (AppWindow* self) {
Page* _tmp0_ = NULL;
CheckerboardPage* _tmp1_ = NULL;
Page* _tmp2_ = NULL;
-#line 924 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 927 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 925 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 925 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 925 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ == NULL) {
-#line 925 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 5914 "AppWindow.c"
+#line 5919 "AppWindow.c"
}
-#line 925 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/AppWindow.vala"
page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 926 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = page;
-#line 926 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_ != NULL) {
-#line 5922 "AppWindow.c"
+#line 5927 "AppWindow.c"
Page* _tmp3_ = NULL;
ViewCollection* _tmp4_ = NULL;
ViewCollection* _tmp5_ = NULL;
-#line 927 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = page;
-#line 927 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = page_get_view (_tmp3_);
-#line 927 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _tmp4_;
-#line 927 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/AppWindow.vala"
view_collection_select_all (_tmp5_);
-#line 927 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp5_);
-#line 5936 "AppWindow.c"
+#line 5941 "AppWindow.c"
}
-#line 924 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 927 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (page);
-#line 5940 "AppWindow.c"
+#line 5945 "AppWindow.c"
}
@@ -5979,43 +5981,43 @@ static void app_window_on_select_none (AppWindow* self) {
Page* _tmp0_ = NULL;
CheckerboardPage* _tmp1_ = NULL;
Page* _tmp2_ = NULL;
-#line 930 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 933 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_if_fail (IS_APP_WINDOW (self));
-#line 931 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 931 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 931 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp1_ == NULL) {
-#line 931 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (_tmp0_);
-#line 5959 "AppWindow.c"
+#line 5964 "AppWindow.c"
}
-#line 931 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/AppWindow.vala"
page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 932 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = page;
-#line 932 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (_tmp2_ != NULL) {
-#line 5967 "AppWindow.c"
+#line 5972 "AppWindow.c"
Page* _tmp3_ = NULL;
ViewCollection* _tmp4_ = NULL;
ViewCollection* _tmp5_ = NULL;
-#line 933 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp3_ = page;
-#line 933 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp4_ = page_get_view (_tmp3_);
-#line 933 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = _tmp4_;
-#line 933 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/AppWindow.vala"
view_collection_unselect_all (_tmp5_);
-#line 933 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/AppWindow.vala"
_data_collection_unref0 (_tmp5_);
-#line 5981 "AppWindow.c"
+#line 5986 "AppWindow.c"
}
-#line 930 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 933 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (page);
-#line 5985 "AppWindow.c"
+#line 5990 "AppWindow.c"
}
@@ -6027,103 +6029,103 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
gboolean _tmp2_ = FALSE;
GdkEventConfigure* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
-#line 936 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 939 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 936 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 939 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 937 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 940 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 937 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 940 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp1_ = gdk_window_get_state (_tmp0_);
-#line 937 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 940 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->maximized = _tmp1_ == GDK_WINDOW_STATE_MAXIMIZED;
-#line 939 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 942 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp2_ = self->maximized;
-#line 939 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 942 "/home/jens/Source/shotwell/src/AppWindow.vala"
if (!_tmp2_) {
-#line 6011 "AppWindow.c"
+#line 6016 "AppWindow.c"
gint _tmp3_ = 0;
gint _tmp4_ = 0;
-#line 940 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/AppWindow.vala"
gtk_window_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp3_, &_tmp4_);
-#line 940 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->dimensions.width = _tmp3_;
-#line 940 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->dimensions.height = _tmp4_;
-#line 6020 "AppWindow.c"
+#line 6025 "AppWindow.c"
}
-#line 942 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp5_ = event;
-#line 942 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp6_ = GTK_WIDGET_CLASS (app_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 942 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/AppWindow.vala"
result = _tmp6_;
-#line 942 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/AppWindow.vala"
return result;
-#line 6030 "AppWindow.c"
+#line 6035 "AppWindow.c"
}
static void app_window_class_init (AppWindowClass * klass) {
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
app_window_parent_class = g_type_class_peek_parent (klass);
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
g_type_class_add_private (klass, sizeof (AppWindowPrivate));
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
((AppWindowClass *) klass)->on_fullscreen = app_window_real_on_fullscreen;
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
((AppWindowClass *) klass)->get_app_role = app_window_real_get_app_role;
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
((AppWindowClass *) klass)->on_quit = app_window_real_on_quit;
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
((GtkWidgetClass *) klass)->destroy = app_window_real_destroy;
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
((AppWindowClass *) klass)->create_common_action_groups = app_window_real_create_common_action_groups;
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
((AppWindowClass *) klass)->replace_common_placeholders = app_window_real_replace_common_placeholders;
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
((PageWindowClass *) klass)->switched_pages = app_window_real_switched_pages;
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
((AppWindowClass *) klass)->update_common_action_availability = app_window_real_update_common_action_availability;
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
((AppWindowClass *) klass)->update_common_actions = app_window_real_update_common_actions;
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
((GtkWidgetClass *) klass)->configure_event = app_window_real_configure_event;
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
G_OBJECT_CLASS (klass)->finalize = app_window_finalize;
-#line 6061 "AppWindow.c"
+#line 6066 "AppWindow.c"
}
static void app_window_instance_init (AppWindow * self) {
GtkActionGroup* _tmp0_ = NULL;
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv = APP_WINDOW_GET_PRIVATE (self);
-#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->maximized = FALSE;
-#line 419 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 422 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->pos_x = 0;
-#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->pos_y = 0;
-#line 422 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/AppWindow.vala"
_tmp0_ = gtk_action_group_new ("AppWindowGlobalActionGroup");
-#line 422 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->priv->common_action_group = _tmp0_;
-#line 6079 "AppWindow.c"
+#line 6084 "AppWindow.c"
}
static void app_window_finalize (GObject* obj) {
AppWindow * self;
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APP_WINDOW, AppWindow);
-#line 416 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 419 "/home/jens/Source/shotwell/src/AppWindow.vala"
self->common_action_groups = (_vala_array_free (self->common_action_groups, self->common_action_groups_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 422 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/AppWindow.vala"
_g_object_unref0 (self->priv->common_action_group);
-#line 406 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
G_OBJECT_CLASS (app_window_parent_class)->finalize (obj);
-#line 6093 "AppWindow.c"
+#line 6098 "AppWindow.c"
}
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index b70a20c..b979d9e 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -98,6 +98,9 @@ public class FullscreenWindow : PageWindow {
// start off with toolbar invoked, as a clue for the user
invoke_toolbar();
+
+ // Toolbar steals keyboard focus from page, put it back again
+ page.grab_focus ();
}
public void disable_toolbar_dismissal() {
diff --git a/src/Application.c b/src/Application.c
index 3501ff0..c0dcecf 100644
--- a/src/Application.c
+++ b/src/Application.c
@@ -1,4 +1,4 @@
-/* Application.c generated by valac 0.32.1, the Vala compiler
+/* Application.c generated by valac 0.34.1, the Vala compiler
* generated from Application.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/BatchImport.c b/src/BatchImport.c
index 6950577..33f0fff 100644
--- a/src/BatchImport.c
+++ b/src/BatchImport.c
@@ -1,4 +1,4 @@
-/* BatchImport.c generated by valac 0.32.1, the Vala compiler
+/* BatchImport.c generated by valac 0.34.1, the Vala compiler
* generated from BatchImport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Box.c b/src/Box.c
index 0ebb6da..3cd73cc 100644
--- a/src/Box.c
+++ b/src/Box.c
@@ -1,4 +1,4 @@
-/* Box.c generated by valac 0.32.1, the Vala compiler
+/* Box.c generated by valac 0.34.1, the Vala compiler
* generated from Box.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/CheckerboardLayout.c b/src/CheckerboardLayout.c
index c6c8195..d73f031 100644
--- a/src/CheckerboardLayout.c
+++ b/src/CheckerboardLayout.c
@@ -1,4 +1,4 @@
-/* CheckerboardLayout.c generated by valac 0.32.1, the Vala compiler
+/* CheckerboardLayout.c generated by valac 0.34.1, the Vala compiler
* generated from CheckerboardLayout.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1384,11 +1384,11 @@ void checkerboard_item_text_unref (gpointer instance) {
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
#line 1394 "CheckerboardLayout.c"
{
@@ -1403,73 +1403,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 1425 "CheckerboardLayout.c"
goto __catch229_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 1434 "CheckerboardLayout.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 1450 "CheckerboardLayout.c"
goto __catch229_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 1461 "CheckerboardLayout.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1475 "CheckerboardLayout.c"
}
@@ -1477,24 +1477,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
__catch229_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
#line 1489 "CheckerboardLayout.c"
}
__finally229:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 1500 "CheckerboardLayout.c"
}
@@ -7296,15 +7296,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 7310 "CheckerboardLayout.c"
}
@@ -7317,37 +7317,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 7333 "CheckerboardLayout.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 7341 "CheckerboardLayout.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 7353 "CheckerboardLayout.c"
}
@@ -7367,112 +7367,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 7377 "CheckerboardLayout.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 7383 "CheckerboardLayout.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 7387 "CheckerboardLayout.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 7391 "CheckerboardLayout.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 7403 "CheckerboardLayout.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 7413 "CheckerboardLayout.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 7419 "CheckerboardLayout.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 7433 "CheckerboardLayout.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 7443 "CheckerboardLayout.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 7449 "CheckerboardLayout.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 7458 "CheckerboardLayout.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 7478 "CheckerboardLayout.c"
}
diff --git a/src/CollectionPage.c b/src/CollectionPage.c
index a5b1c04..84e0b3f 100644
--- a/src/CollectionPage.c
+++ b/src/CollectionPage.c
@@ -1,4 +1,4 @@
-/* CollectionPage.c generated by valac 0.32.1, the Vala compiler
+/* CollectionPage.c generated by valac 0.34.1, the Vala compiler
* generated from CollectionPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/ColorTransformation.c b/src/ColorTransformation.c
index 2a3e7c4..245e71c 100644
--- a/src/ColorTransformation.c
+++ b/src/ColorTransformation.c
@@ -1,4 +1,4 @@
-/* ColorTransformation.c generated by valac 0.32.1, the Vala compiler
+/* ColorTransformation.c generated by valac 0.34.1, the Vala compiler
* generated from ColorTransformation.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -11796,19 +11796,19 @@ static gchar* string_chug (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1199 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strchug (_tmp1_);
-#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 11809 "ColorTransformation.c"
}
@@ -11819,19 +11819,19 @@ static gchar* string_chomp (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1191 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strchomp (_tmp1_);
-#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 11832 "ColorTransformation.c"
}
diff --git a/src/CommandManager.c b/src/CommandManager.c
index 60cb438..69ef7f6 100644
--- a/src/CommandManager.c
+++ b/src/CommandManager.c
@@ -1,4 +1,4 @@
-/* CommandManager.c generated by valac 0.32.1, the Vala compiler
+/* CommandManager.c generated by valac 0.34.1, the Vala compiler
* generated from CommandManager.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Commands.c b/src/Commands.c
index a9d9bc5..1e59698 100644
--- a/src/Commands.c
+++ b/src/Commands.c
@@ -1,4 +1,4 @@
-/* Commands.c generated by valac 0.32.1, the Vala compiler
+/* Commands.c generated by valac 0.34.1, the Vala compiler
* generated from Commands.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -14570,11 +14570,11 @@ static void reparent_tag_command_on_items_destroyed (ReparentTagCommand* self, G
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
#line 14580 "Commands.c"
{
@@ -14589,73 +14589,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 14611 "Commands.c"
goto __catch449_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 14620 "Commands.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 14636 "Commands.c"
goto __catch449_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 14647 "Commands.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 14661 "Commands.c"
}
@@ -14663,24 +14663,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
__catch449_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
#line 14675 "Commands.c"
}
__finally449:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 14686 "Commands.c"
}
@@ -15981,37 +15981,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 15997 "Commands.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 16005 "Commands.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 16017 "Commands.c"
}
@@ -16031,112 +16031,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 16041 "Commands.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 16047 "Commands.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 16051 "Commands.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 16055 "Commands.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 16067 "Commands.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 16077 "Commands.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 16083 "Commands.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 16097 "Commands.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 16107 "Commands.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 16113 "Commands.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 16122 "Commands.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 16142 "Commands.c"
}
diff --git a/src/CustomComponents.c b/src/CustomComponents.c
index 053e2fa..f156b46 100644
--- a/src/CustomComponents.c
+++ b/src/CustomComponents.c
@@ -1,4 +1,4 @@
-/* CustomComponents.c generated by valac 0.32.1, the Vala compiler
+/* CustomComponents.c generated by valac 0.34.1, the Vala compiler
* generated from CustomComponents.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Debug.c b/src/Debug.c
index 9cc7e01..afacca4 100644
--- a/src/Debug.c
+++ b/src/Debug.c
@@ -1,4 +1,4 @@
-/* Debug.c generated by valac 0.32.1, the Vala compiler
+/* Debug.c generated by valac 0.34.1, the Vala compiler
* generated from Debug.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -526,13 +526,13 @@ gboolean debug_is_enabled (GLogLevelFlags flag) {
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return;
#line 538 "Debug.c"
}
@@ -547,23 +547,23 @@ static gchar* g_time_to_string (struct tm *self) {
gint _tmp4_ = 0;
gint _tmp5_ = 0;
gchar* _tmp6_ = NULL;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = (*self).tm_year;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = (*self).tm_mon;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = (*self).tm_mday;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = (*self).tm_hour;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = (*self).tm_min;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = (*self).tm_sec;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = g_strdup_printf ("%04d-%02d-%02d %02d:%02d:%02d", _tmp0_ + 1900, _tmp1_ + 1, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp6_;
-#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 569 "Debug.c"
}
diff --git a/src/DesktopIntegration.c b/src/DesktopIntegration.c
index f0e3b6d..26190e3 100644
--- a/src/DesktopIntegration.c
+++ b/src/DesktopIntegration.c
@@ -1,4 +1,4 @@
-/* DesktopIntegration.c generated by valac 0.32.1, the Vala compiler
+/* DesktopIntegration.c generated by valac 0.34.1, the Vala compiler
* generated from DesktopIntegration.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -484,17 +484,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 500 "DesktopIntegration.c"
}
@@ -1802,7 +1802,7 @@ void desktop_integration_background_slideshow_xml_builder_open (DesktopIntegrati
#line 1803 "DesktopIntegration.c"
}
#line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
- _tmp3_ = g_data_output_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OUTPUT_STREAM, GOutputStream));
+ _tmp3_ = g_data_output_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_output_stream_get_type (), GOutputStream));
#line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
_g_object_unref0 (self->priv->outs);
#line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2200,7 +2200,7 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr
#line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
_tmp7_ = self->priv->outs;
#line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
- g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OUTPUT_STREAM, GOutputStream), NULL, &_inner_error_);
+ g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, g_output_stream_get_type (), GOutputStream), NULL, &_inner_error_);
#line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
diff --git a/src/Dialogs.c b/src/Dialogs.c
index 6928c51..7f02943 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -1,4 +1,4 @@
-/* Dialogs.c generated by valac 0.32.1, the Vala compiler
+/* Dialogs.c generated by valac 0.34.1, the Vala compiler
* generated from Dialogs.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3885,15 +3885,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3895 "Dialogs.c"
}
@@ -8683,39 +8683,39 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
gint _tmp3__length1 = 0;
guint8* _tmp4_ = NULL;
gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res_length1 = -1;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (result_length1) {
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result_length1 = _tmp4__length1;
#line 8700 "Dialogs.c"
}
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 8706 "Dialogs.c"
}
@@ -8843,7 +8843,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
_tmp21__length1 = _tmp20__length1;
#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
- g_output_stream_write (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, G_TYPE_OUTPUT_STREAM, GOutputStream), _tmp21_, (gsize) _tmp21__length1, NULL, &_inner_error_);
+ g_output_stream_write (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, g_output_stream_get_type (), GOutputStream), _tmp21_, (gsize) _tmp21__length1, NULL, &_inner_error_);
#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -8854,7 +8854,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
#line 911 "/home/jens/Source/shotwell/src/Dialogs.vala"
_tmp22_ = outstream;
#line 911 "/home/jens/Source/shotwell/src/Dialogs.vala"
- g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, G_TYPE_OUTPUT_STREAM, GOutputStream), NULL, &_inner_error_);
+ g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_output_stream_get_type (), GOutputStream), NULL, &_inner_error_);
#line 911 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 911 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9882,19 +9882,19 @@ static gchar* string_strip (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 9885 "Dialogs.c"
}
@@ -9904,17 +9904,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 9905 "Dialogs.c"
}
@@ -9927,33 +9927,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
gunichar _tmp1_ = 0U;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 9930 "Dialogs.c"
gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 9938 "Dialogs.c"
} else {
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = -1;
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 9944 "Dialogs.c"
}
@@ -10218,37 +10218,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 10219 "Dialogs.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 10227 "Dialogs.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 10239 "Dialogs.c"
}
@@ -10268,112 +10268,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 10263 "Dialogs.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 10269 "Dialogs.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 10273 "Dialogs.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 10277 "Dialogs.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 10289 "Dialogs.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 10299 "Dialogs.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 10305 "Dialogs.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 10319 "Dialogs.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 10329 "Dialogs.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 10335 "Dialogs.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 10344 "Dialogs.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 10364 "Dialogs.c"
}
@@ -13812,13 +13812,13 @@ static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return;
#line 13809 "Dialogs.c"
}
@@ -14914,35 +14914,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* _tmp3_ = NULL;
gint _tmp3__length1 = 0;
gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 14933 "Dialogs.c"
}
diff --git a/src/Dimensions.c b/src/Dimensions.c
index 57c20a2..8593eff 100644
--- a/src/Dimensions.c
+++ b/src/Dimensions.c
@@ -1,4 +1,4 @@
-/* Dimensions.c generated by valac 0.32.1, the Vala compiler
+/* Dimensions.c generated by valac 0.34.1, the Vala compiler
* generated from Dimensions.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c
index e451d9d..140736c 100644
--- a/src/DirectoryMonitor.c
+++ b/src/DirectoryMonitor.c
@@ -1,4 +1,4 @@
-/* DirectoryMonitor.c generated by valac 0.32.1, the Vala compiler
+/* DirectoryMonitor.c generated by valac 0.34.1, the Vala compiler
* generated from DirectoryMonitor.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Event.c b/src/Event.c
index a68abc5..0c3af9b 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -1,4 +1,4 @@
-/* Event.c generated by valac 0.32.1, the Vala compiler
+/* Event.c generated by valac 0.34.1, the Vala compiler
* generated from Event.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -4322,72 +4322,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
gboolean _tmp2_ = FALSE;
gchar** _tmp3_ = NULL;
gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
separator = "";
#line 4332 "Event.c"
}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = TRUE;
#line 4342 "Event.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp4__length1 > 0;
#line 4352 "Event.c"
}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = TRUE;
#line 4358 "Event.c"
} else {
gboolean _tmp5_ = FALSE;
gchar** _tmp6_ = NULL;
gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp6__length1 == -1) {
#line 4369 "Event.c"
gchar** _tmp7_ = NULL;
gint _tmp7__length1 = 0;
const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_ != NULL;
#line 4381 "Event.c"
} else {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = FALSE;
#line 4385 "Event.c"
}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp5_;
#line 4389 "Event.c"
}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_) {
#line 4393 "Event.c"
gint i = 0;
@@ -4410,16 +4410,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
const gchar* _tmp44_ = NULL;
void* _tmp45_ = NULL;
const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = (gsize) 1;
#line 4416 "Event.c"
{
gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
i = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
while (TRUE) {
#line 4425 "Event.c"
gboolean _tmp11_ = FALSE;
@@ -4432,97 +4432,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
gint _tmp23_ = 0;
const gchar* _tmp24_ = NULL;
gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (!_tmp9_) {
#line 4438 "Event.c"
gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
i = _tmp10_ + 1;
#line 4444 "Event.c"
}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp13__length1 != -1) {
#line 4454 "Event.c"
gint _tmp14_ = 0;
gchar** _tmp15_ = NULL;
gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ < _tmp15__length1;
#line 4466 "Event.c"
} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
#line 4470 "Event.c"
}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = TRUE;
#line 4476 "Event.c"
} else {
gboolean _tmp16_ = FALSE;
gchar** _tmp17_ = NULL;
gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp17__length1 == -1) {
#line 4487 "Event.c"
gchar** _tmp18_ = NULL;
gint _tmp18__length1 = 0;
gint _tmp19_ = 0;
const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = _tmp20_ != NULL;
#line 4502 "Event.c"
} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = FALSE;
#line 4506 "Event.c"
}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = _tmp16_;
#line 4510 "Event.c"
}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
break;
#line 4516 "Event.c"
}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp24_ != NULL) {
#line 4528 "Event.c"
gchar** _tmp25_ = NULL;
@@ -4531,91 +4531,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
const gchar* _tmp27_ = NULL;
gint _tmp28_ = 0;
gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = _tmp29_;
#line 4549 "Event.c"
} else {
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = 0;
#line 4553 "Event.c"
}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp30_ + _tmp21_;
#line 4559 "Event.c"
}
}
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp31_ == 0) {
#line 4566 "Event.c"
gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp32_;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 4574 "Event.c"
}
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res = _tmp41_;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
ptr = _tmp45_;
#line 4612 "Event.c"
{
gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
i = 1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
while (TRUE) {
#line 4621 "Event.c"
gint _tmp48_ = 0;
@@ -4631,94 +4631,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
const gchar* _tmp56_ = NULL;
void* _tmp60_ = NULL;
void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (!_tmp46_) {
#line 4637 "Event.c"
gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
i = _tmp47_ + 1;
#line 4643 "Event.c"
}
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
break;
#line 4657 "Event.c"
}
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp56_ != NULL) {
#line 4677 "Event.c"
gchar** _tmp57_ = NULL;
gint _tmp57__length1 = 0;
gint _tmp58_ = 0;
const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp53_ = (const gchar*) _tmp59_;
#line 4692 "Event.c"
} else {
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp53_ = "";
#line 4696 "Event.c"
}
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
ptr = _tmp61_;
#line 4704 "Event.c"
}
}
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res = NULL;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 4715 "Event.c"
} else {
gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp63_;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 4724 "Event.c"
}
@@ -4898,13 +4898,13 @@ static const gchar* event_real_get_indexable_keywords (Indexable* base) {
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return;
#line 4910 "Event.c"
}
@@ -5017,43 +5017,45 @@ gboolean event_is_in_starting_day (Event* self, time_t time) {
#line 5018 "Event.c"
time_t _tmp19_ = 0;
#line 621 "/home/jens/Source/shotwell/src/Event.vala"
+ g_debug ("Event.vala:621: Hour before boundary, shifting back one day");
+#line 622 "/home/jens/Source/shotwell/src/Event.vala"
_tmp19_ = start_boundary;
-#line 621 "/home/jens/Source/shotwell/src/Event.vala"
+#line 622 "/home/jens/Source/shotwell/src/Event.vala"
start_boundary = _tmp19_ - EVENT_TIME_T_DAY;
-#line 5024 "Event.c"
+#line 5026 "Event.c"
}
-#line 623 "/home/jens/Source/shotwell/src/Event.vala"
+#line 625 "/home/jens/Source/shotwell/src/Event.vala"
_tmp20_ = start_boundary;
-#line 623 "/home/jens/Source/shotwell/src/Event.vala"
- end_boundary = (_tmp20_ + EVENT_TIME_T_DAY) - 1;
#line 625 "/home/jens/Source/shotwell/src/Event.vala"
+ end_boundary = (_tmp20_ + EVENT_TIME_T_DAY) - 1;
+#line 627 "/home/jens/Source/shotwell/src/Event.vala"
_tmp22_ = time;
-#line 625 "/home/jens/Source/shotwell/src/Event.vala"
+#line 627 "/home/jens/Source/shotwell/src/Event.vala"
_tmp23_ = start_boundary;
-#line 625 "/home/jens/Source/shotwell/src/Event.vala"
+#line 627 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp22_ >= _tmp23_) {
-#line 5036 "Event.c"
+#line 5038 "Event.c"
time_t _tmp24_ = 0;
time_t _tmp25_ = 0;
-#line 625 "/home/jens/Source/shotwell/src/Event.vala"
+#line 627 "/home/jens/Source/shotwell/src/Event.vala"
_tmp24_ = time;
-#line 625 "/home/jens/Source/shotwell/src/Event.vala"
+#line 627 "/home/jens/Source/shotwell/src/Event.vala"
_tmp25_ = end_boundary;
-#line 625 "/home/jens/Source/shotwell/src/Event.vala"
+#line 627 "/home/jens/Source/shotwell/src/Event.vala"
_tmp21_ = _tmp24_ <= _tmp25_;
-#line 5045 "Event.c"
+#line 5047 "Event.c"
} else {
-#line 625 "/home/jens/Source/shotwell/src/Event.vala"
+#line 627 "/home/jens/Source/shotwell/src/Event.vala"
_tmp21_ = FALSE;
-#line 5049 "Event.c"
+#line 5051 "Event.c"
}
-#line 625 "/home/jens/Source/shotwell/src/Event.vala"
+#line 627 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp21_;
-#line 625 "/home/jens/Source/shotwell/src/Event.vala"
+#line 627 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (earliest_media);
-#line 625 "/home/jens/Source/shotwell/src/Event.vala"
+#line 627 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 5057 "Event.c"
+#line 5059 "Event.c"
}
@@ -5069,82 +5071,82 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
ViewCollection* _tmp8_ = NULL;
gint _tmp9_ = 0;
GError * _inner_error_ = NULL;
-#line 631 "/home/jens/Source/shotwell/src/Event.vala"
+#line 633 "/home/jens/Source/shotwell/src/Event.vala"
g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL);
-#line 631 "/home/jens/Source/shotwell/src/Event.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (events_so_far), NULL);
#line 633 "/home/jens/Source/shotwell/src/Event.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (events_so_far), NULL);
+#line 635 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = media;
-#line 633 "/home/jens/Source/shotwell/src/Event.vala"
+#line 635 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = media_source_get_exposure_time (_tmp0_);
-#line 633 "/home/jens/Source/shotwell/src/Event.vala"
- exposure_time = _tmp1_;
#line 635 "/home/jens/Source/shotwell/src/Event.vala"
+ exposure_time = _tmp1_;
+#line 637 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = exposure_time;
-#line 635 "/home/jens/Source/shotwell/src/Event.vala"
+#line 637 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp3_ == ((time_t) 0)) {
-#line 5087 "Event.c"
+#line 5089 "Event.c"
const gchar* _tmp4_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/Event.vala"
+#line 637 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = event_name;
-#line 635 "/home/jens/Source/shotwell/src/Event.vala"
+#line 637 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = _tmp4_ == NULL;
-#line 5093 "Event.c"
+#line 5095 "Event.c"
} else {
-#line 635 "/home/jens/Source/shotwell/src/Event.vala"
+#line 637 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = FALSE;
-#line 5097 "Event.c"
+#line 5099 "Event.c"
}
-#line 635 "/home/jens/Source/shotwell/src/Event.vala"
+#line 637 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp2_) {
-#line 5101 "Event.c"
+#line 5103 "Event.c"
MediaSource* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
-#line 636 "/home/jens/Source/shotwell/src/Event.vala"
+#line 638 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = media;
-#line 636 "/home/jens/Source/shotwell/src/Event.vala"
+#line 638 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject));
-#line 636 "/home/jens/Source/shotwell/src/Event.vala"
+#line 638 "/home/jens/Source/shotwell/src/Event.vala"
_tmp7_ = _tmp6_;
-#line 636 "/home/jens/Source/shotwell/src/Event.vala"
- g_debug ("Event.vala:636: Skipping event assignment to %s: no exposure time and " \
+#line 638 "/home/jens/Source/shotwell/src/Event.vala"
+ g_debug ("Event.vala:638: Skipping event assignment to %s: no exposure time and " \
"no event name", _tmp7_);
-#line 636 "/home/jens/Source/shotwell/src/Event.vala"
+#line 638 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (_tmp7_);
-#line 637 "/home/jens/Source/shotwell/src/Event.vala"
- _vala_new_event = FALSE;
#line 639 "/home/jens/Source/shotwell/src/Event.vala"
+ _vala_new_event = FALSE;
+#line 641 "/home/jens/Source/shotwell/src/Event.vala"
result = NULL;
-#line 639 "/home/jens/Source/shotwell/src/Event.vala"
+#line 641 "/home/jens/Source/shotwell/src/Event.vala"
if (new_event) {
-#line 639 "/home/jens/Source/shotwell/src/Event.vala"
+#line 641 "/home/jens/Source/shotwell/src/Event.vala"
*new_event = _vala_new_event;
-#line 5123 "Event.c"
+#line 5125 "Event.c"
}
-#line 639 "/home/jens/Source/shotwell/src/Event.vala"
+#line 641 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 5127 "Event.c"
+#line 5129 "Event.c"
}
-#line 642 "/home/jens/Source/shotwell/src/Event.vala"
+#line 644 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = events_so_far;
-#line 642 "/home/jens/Source/shotwell/src/Event.vala"
+#line 644 "/home/jens/Source/shotwell/src/Event.vala"
_tmp9_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection));
-#line 642 "/home/jens/Source/shotwell/src/Event.vala"
+#line 644 "/home/jens/Source/shotwell/src/Event.vala"
count = _tmp9_;
-#line 5135 "Event.c"
+#line 5137 "Event.c"
{
gint ctr = 0;
-#line 643 "/home/jens/Source/shotwell/src/Event.vala"
+#line 645 "/home/jens/Source/shotwell/src/Event.vala"
ctr = 0;
-#line 5140 "Event.c"
+#line 5142 "Event.c"
{
gboolean _tmp10_ = FALSE;
-#line 643 "/home/jens/Source/shotwell/src/Event.vala"
+#line 645 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = TRUE;
-#line 643 "/home/jens/Source/shotwell/src/Event.vala"
+#line 645 "/home/jens/Source/shotwell/src/Event.vala"
while (TRUE) {
-#line 5147 "Event.c"
+#line 5149 "Event.c"
gint _tmp12_ = 0;
gint _tmp13_ = 0;
Event* event = NULL;
@@ -5158,126 +5160,126 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
gboolean _tmp21_ = FALSE;
gboolean _tmp22_ = FALSE;
const gchar* _tmp23_ = NULL;
-#line 643 "/home/jens/Source/shotwell/src/Event.vala"
+#line 645 "/home/jens/Source/shotwell/src/Event.vala"
if (!_tmp10_) {
-#line 5163 "Event.c"
+#line 5165 "Event.c"
gint _tmp11_ = 0;
-#line 643 "/home/jens/Source/shotwell/src/Event.vala"
+#line 645 "/home/jens/Source/shotwell/src/Event.vala"
_tmp11_ = ctr;
-#line 643 "/home/jens/Source/shotwell/src/Event.vala"
+#line 645 "/home/jens/Source/shotwell/src/Event.vala"
ctr = _tmp11_ + 1;
-#line 5169 "Event.c"
+#line 5171 "Event.c"
}
-#line 643 "/home/jens/Source/shotwell/src/Event.vala"
+#line 645 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = FALSE;
-#line 643 "/home/jens/Source/shotwell/src/Event.vala"
+#line 645 "/home/jens/Source/shotwell/src/Event.vala"
_tmp12_ = ctr;
-#line 643 "/home/jens/Source/shotwell/src/Event.vala"
+#line 645 "/home/jens/Source/shotwell/src/Event.vala"
_tmp13_ = count;
-#line 643 "/home/jens/Source/shotwell/src/Event.vala"
+#line 645 "/home/jens/Source/shotwell/src/Event.vala"
if (!(_tmp12_ < _tmp13_)) {
-#line 643 "/home/jens/Source/shotwell/src/Event.vala"
+#line 645 "/home/jens/Source/shotwell/src/Event.vala"
break;
-#line 5181 "Event.c"
+#line 5183 "Event.c"
}
-#line 644 "/home/jens/Source/shotwell/src/Event.vala"
+#line 646 "/home/jens/Source/shotwell/src/Event.vala"
_tmp14_ = events_so_far;
-#line 644 "/home/jens/Source/shotwell/src/Event.vala"
+#line 646 "/home/jens/Source/shotwell/src/Event.vala"
_tmp15_ = ctr;
-#line 644 "/home/jens/Source/shotwell/src/Event.vala"
+#line 646 "/home/jens/Source/shotwell/src/Event.vala"
_tmp16_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), _tmp15_);
-#line 644 "/home/jens/Source/shotwell/src/Event.vala"
+#line 646 "/home/jens/Source/shotwell/src/Event.vala"
_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT_VIEW, EventView);
-#line 644 "/home/jens/Source/shotwell/src/Event.vala"
+#line 646 "/home/jens/Source/shotwell/src/Event.vala"
_tmp18_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_VIEW, DataView));
-#line 644 "/home/jens/Source/shotwell/src/Event.vala"
+#line 646 "/home/jens/Source/shotwell/src/Event.vala"
_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_EVENT, Event);
-#line 644 "/home/jens/Source/shotwell/src/Event.vala"
+#line 646 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp17_);
-#line 644 "/home/jens/Source/shotwell/src/Event.vala"
- event = _tmp19_;
#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+ event = _tmp19_;
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
_tmp23_ = event_name;
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp23_ != NULL) {
-#line 5203 "Event.c"
+#line 5205 "Event.c"
Event* _tmp24_ = NULL;
gboolean _tmp25_ = FALSE;
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
_tmp24_ = event;
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
_tmp25_ = event_has_name (_tmp24_);
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
_tmp22_ = _tmp25_;
-#line 5212 "Event.c"
+#line 5214 "Event.c"
} else {
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
_tmp22_ = FALSE;
-#line 5216 "Event.c"
+#line 5218 "Event.c"
}
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp22_) {
-#line 5220 "Event.c"
+#line 5222 "Event.c"
const gchar* _tmp26_ = NULL;
Event* _tmp27_ = NULL;
gchar* _tmp28_ = NULL;
gchar* _tmp29_ = NULL;
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
_tmp26_ = event_name;
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
_tmp27_ = event;
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
_tmp28_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_OBJECT, DataObject));
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
_tmp29_ = _tmp28_;
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
_tmp21_ = g_strcmp0 (_tmp26_, _tmp29_) == 0;
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (_tmp29_);
-#line 5237 "Event.c"
+#line 5239 "Event.c"
} else {
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
_tmp21_ = FALSE;
-#line 5241 "Event.c"
+#line 5243 "Event.c"
}
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp21_) {
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
+#line 648 "/home/jens/Source/shotwell/src/Event.vala"
_tmp20_ = TRUE;
-#line 5247 "Event.c"
+#line 5249 "Event.c"
} else {
Event* _tmp30_ = NULL;
time_t _tmp31_ = 0;
gboolean _tmp32_ = FALSE;
-#line 647 "/home/jens/Source/shotwell/src/Event.vala"
+#line 649 "/home/jens/Source/shotwell/src/Event.vala"
_tmp30_ = event;
-#line 647 "/home/jens/Source/shotwell/src/Event.vala"
+#line 649 "/home/jens/Source/shotwell/src/Event.vala"
_tmp31_ = exposure_time;
-#line 647 "/home/jens/Source/shotwell/src/Event.vala"
+#line 649 "/home/jens/Source/shotwell/src/Event.vala"
_tmp32_ = event_is_in_starting_day (_tmp30_, _tmp31_);
-#line 647 "/home/jens/Source/shotwell/src/Event.vala"
+#line 649 "/home/jens/Source/shotwell/src/Event.vala"
_tmp20_ = _tmp32_;
-#line 5260 "Event.c"
+#line 5262 "Event.c"
}
-#line 646 "/home/jens/Source/shotwell/src/Event.vala"
- if (_tmp20_) {
#line 648 "/home/jens/Source/shotwell/src/Event.vala"
- _vala_new_event = FALSE;
+ if (_tmp20_) {
#line 650 "/home/jens/Source/shotwell/src/Event.vala"
+ _vala_new_event = FALSE;
+#line 652 "/home/jens/Source/shotwell/src/Event.vala"
result = event;
-#line 650 "/home/jens/Source/shotwell/src/Event.vala"
+#line 652 "/home/jens/Source/shotwell/src/Event.vala"
if (new_event) {
-#line 650 "/home/jens/Source/shotwell/src/Event.vala"
+#line 652 "/home/jens/Source/shotwell/src/Event.vala"
*new_event = _vala_new_event;
-#line 5272 "Event.c"
+#line 5274 "Event.c"
}
-#line 650 "/home/jens/Source/shotwell/src/Event.vala"
+#line 652 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 5276 "Event.c"
+#line 5278 "Event.c"
}
-#line 643 "/home/jens/Source/shotwell/src/Event.vala"
+#line 645 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (event);
-#line 5280 "Event.c"
+#line 5282 "Event.c"
}
}
}
@@ -5297,129 +5299,129 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
Event* _tmp46_ = NULL;
EventView* _tmp47_ = NULL;
EventView* _tmp48_ = NULL;
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
_tmp34_ = event_table_get_instance ();
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
_tmp35_ = _tmp34_;
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
_tmp36_ = media;
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
_tmp37_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_SOURCE, DataSource));
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
_tmp38_ = _tmp37_;
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
_tmp39_ = event_table_create (_tmp35_, _tmp38_, NULL, &_inner_error_);
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
_tmp40_ = _tmp39_;
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (_tmp38_);
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
_database_table_unref0 (_tmp35_);
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
_tmp33_ = _tmp40_;
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5324 "Event.c"
+#line 5326 "Event.c"
goto __catch429_database_error;
}
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
g_clear_error (&_inner_error_);
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
return NULL;
-#line 5333 "Event.c"
+#line 5335 "Event.c"
}
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
_tmp41_ = event_new (_tmp33_, DATA_OBJECT_INVALID_OBJECT_ID);
-#line 656 "/home/jens/Source/shotwell/src/Event.vala"
+#line 658 "/home/jens/Source/shotwell/src/Event.vala"
event = _tmp41_;
-#line 657 "/home/jens/Source/shotwell/src/Event.vala"
+#line 659 "/home/jens/Source/shotwell/src/Event.vala"
_tmp42_ = event_name;
-#line 657 "/home/jens/Source/shotwell/src/Event.vala"
+#line 659 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp42_ != NULL) {
-#line 5343 "Event.c"
+#line 5345 "Event.c"
Event* _tmp43_ = NULL;
const gchar* _tmp44_ = NULL;
-#line 658 "/home/jens/Source/shotwell/src/Event.vala"
+#line 660 "/home/jens/Source/shotwell/src/Event.vala"
_tmp43_ = event;
-#line 658 "/home/jens/Source/shotwell/src/Event.vala"
+#line 660 "/home/jens/Source/shotwell/src/Event.vala"
_tmp44_ = event_name;
-#line 658 "/home/jens/Source/shotwell/src/Event.vala"
+#line 660 "/home/jens/Source/shotwell/src/Event.vala"
event_rename (_tmp43_, _tmp44_);
-#line 5352 "Event.c"
+#line 5354 "Event.c"
}
-#line 660 "/home/jens/Source/shotwell/src/Event.vala"
+#line 662 "/home/jens/Source/shotwell/src/Event.vala"
_tmp45_ = events_so_far;
-#line 660 "/home/jens/Source/shotwell/src/Event.vala"
+#line 662 "/home/jens/Source/shotwell/src/Event.vala"
_tmp46_ = event;
-#line 660 "/home/jens/Source/shotwell/src/Event.vala"
+#line 662 "/home/jens/Source/shotwell/src/Event.vala"
_tmp47_ = event_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_EVENT_SOURCE, EventSource));
-#line 660 "/home/jens/Source/shotwell/src/Event.vala"
+#line 662 "/home/jens/Source/shotwell/src/Event.vala"
_tmp48_ = _tmp47_;
-#line 660 "/home/jens/Source/shotwell/src/Event.vala"
+#line 662 "/home/jens/Source/shotwell/src/Event.vala"
data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_DATA_OBJECT, DataObject));
-#line 660 "/home/jens/Source/shotwell/src/Event.vala"
- _g_object_unref0 (_tmp48_);
#line 662 "/home/jens/Source/shotwell/src/Event.vala"
+ _g_object_unref0 (_tmp48_);
+#line 664 "/home/jens/Source/shotwell/src/Event.vala"
_vala_new_event = TRUE;
-#line 663 "/home/jens/Source/shotwell/src/Event.vala"
+#line 665 "/home/jens/Source/shotwell/src/Event.vala"
result = event;
-#line 663 "/home/jens/Source/shotwell/src/Event.vala"
+#line 665 "/home/jens/Source/shotwell/src/Event.vala"
_event_row_unref0 (_tmp33_);
-#line 663 "/home/jens/Source/shotwell/src/Event.vala"
+#line 665 "/home/jens/Source/shotwell/src/Event.vala"
if (new_event) {
-#line 663 "/home/jens/Source/shotwell/src/Event.vala"
+#line 665 "/home/jens/Source/shotwell/src/Event.vala"
*new_event = _vala_new_event;
-#line 5376 "Event.c"
+#line 5378 "Event.c"
}
-#line 663 "/home/jens/Source/shotwell/src/Event.vala"
+#line 665 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 5380 "Event.c"
+#line 5382 "Event.c"
}
goto __finally429;
__catch429_database_error:
{
GError* err = NULL;
GError* _tmp49_ = NULL;
-#line 655 "/home/jens/Source/shotwell/src/Event.vala"
+#line 657 "/home/jens/Source/shotwell/src/Event.vala"
err = _inner_error_;
-#line 655 "/home/jens/Source/shotwell/src/Event.vala"
+#line 657 "/home/jens/Source/shotwell/src/Event.vala"
_inner_error_ = NULL;
-#line 665 "/home/jens/Source/shotwell/src/Event.vala"
+#line 667 "/home/jens/Source/shotwell/src/Event.vala"
_tmp49_ = err;
-#line 665 "/home/jens/Source/shotwell/src/Event.vala"
+#line 667 "/home/jens/Source/shotwell/src/Event.vala"
app_window_database_error (_tmp49_);
-#line 655 "/home/jens/Source/shotwell/src/Event.vala"
+#line 657 "/home/jens/Source/shotwell/src/Event.vala"
_g_error_free0 (err);
-#line 5397 "Event.c"
+#line 5399 "Event.c"
}
__finally429:
-#line 655 "/home/jens/Source/shotwell/src/Event.vala"
+#line 657 "/home/jens/Source/shotwell/src/Event.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 655 "/home/jens/Source/shotwell/src/Event.vala"
+#line 657 "/home/jens/Source/shotwell/src/Event.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 655 "/home/jens/Source/shotwell/src/Event.vala"
+#line 657 "/home/jens/Source/shotwell/src/Event.vala"
g_clear_error (&_inner_error_);
-#line 655 "/home/jens/Source/shotwell/src/Event.vala"
+#line 657 "/home/jens/Source/shotwell/src/Event.vala"
return NULL;
-#line 5408 "Event.c"
+#line 5410 "Event.c"
}
-#line 668 "/home/jens/Source/shotwell/src/Event.vala"
- _vala_new_event = FALSE;
#line 670 "/home/jens/Source/shotwell/src/Event.vala"
+ _vala_new_event = FALSE;
+#line 672 "/home/jens/Source/shotwell/src/Event.vala"
result = NULL;
-#line 670 "/home/jens/Source/shotwell/src/Event.vala"
+#line 672 "/home/jens/Source/shotwell/src/Event.vala"
if (new_event) {
-#line 670 "/home/jens/Source/shotwell/src/Event.vala"
+#line 672 "/home/jens/Source/shotwell/src/Event.vala"
*new_event = _vala_new_event;
-#line 5418 "Event.c"
+#line 5420 "Event.c"
}
-#line 670 "/home/jens/Source/shotwell/src/Event.vala"
+#line 672 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 5422 "Event.c"
+#line 5424 "Event.c"
}
@@ -5439,72 +5441,72 @@ void event_generate_single_event (MediaSource* media, ViewCollection* events_so_
MediaSource* _tmp10_ = NULL;
Event* _tmp11_ = NULL;
gboolean _tmp12_ = FALSE;
-#line 673 "/home/jens/Source/shotwell/src/Event.vala"
+#line 675 "/home/jens/Source/shotwell/src/Event.vala"
g_return_if_fail (IS_MEDIA_SOURCE (media));
-#line 673 "/home/jens/Source/shotwell/src/Event.vala"
+#line 675 "/home/jens/Source/shotwell/src/Event.vala"
g_return_if_fail (IS_VIEW_COLLECTION (events_so_far));
-#line 676 "/home/jens/Source/shotwell/src/Event.vala"
+#line 678 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = media;
-#line 676 "/home/jens/Source/shotwell/src/Event.vala"
+#line 678 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = media_source_get_event (_tmp0_);
-#line 676 "/home/jens/Source/shotwell/src/Event.vala"
+#line 678 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = _tmp1_;
-#line 676 "/home/jens/Source/shotwell/src/Event.vala"
+#line 678 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = _tmp2_ != NULL;
-#line 676 "/home/jens/Source/shotwell/src/Event.vala"
+#line 678 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp2_);
-#line 676 "/home/jens/Source/shotwell/src/Event.vala"
+#line 678 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp3_) {
-#line 677 "/home/jens/Source/shotwell/src/Event.vala"
+#line 679 "/home/jens/Source/shotwell/src/Event.vala"
return;
-#line 5460 "Event.c"
+#line 5462 "Event.c"
}
-#line 680 "/home/jens/Source/shotwell/src/Event.vala"
+#line 682 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = media;
-#line 680 "/home/jens/Source/shotwell/src/Event.vala"
+#line 682 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = events_so_far;
-#line 680 "/home/jens/Source/shotwell/src/Event.vala"
+#line 682 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = event_name;
-#line 680 "/home/jens/Source/shotwell/src/Event.vala"
+#line 682 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = event_generate_event (_tmp4_, _tmp5_, _tmp6_, &_tmp7_);
-#line 680 "/home/jens/Source/shotwell/src/Event.vala"
+#line 682 "/home/jens/Source/shotwell/src/Event.vala"
new_event = _tmp7_;
-#line 680 "/home/jens/Source/shotwell/src/Event.vala"
+#line 682 "/home/jens/Source/shotwell/src/Event.vala"
event = _tmp8_;
-#line 681 "/home/jens/Source/shotwell/src/Event.vala"
+#line 683 "/home/jens/Source/shotwell/src/Event.vala"
_tmp9_ = event;
-#line 681 "/home/jens/Source/shotwell/src/Event.vala"
+#line 683 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp9_ == NULL) {
-#line 682 "/home/jens/Source/shotwell/src/Event.vala"
+#line 684 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (event);
-#line 682 "/home/jens/Source/shotwell/src/Event.vala"
+#line 684 "/home/jens/Source/shotwell/src/Event.vala"
return;
-#line 5482 "Event.c"
+#line 5484 "Event.c"
}
-#line 684 "/home/jens/Source/shotwell/src/Event.vala"
+#line 686 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = media;
-#line 684 "/home/jens/Source/shotwell/src/Event.vala"
+#line 686 "/home/jens/Source/shotwell/src/Event.vala"
_tmp11_ = event;
-#line 684 "/home/jens/Source/shotwell/src/Event.vala"
- media_source_set_event (_tmp10_, _tmp11_);
#line 686 "/home/jens/Source/shotwell/src/Event.vala"
+ media_source_set_event (_tmp10_, _tmp11_);
+#line 688 "/home/jens/Source/shotwell/src/Event.vala"
_tmp12_ = new_event;
-#line 686 "/home/jens/Source/shotwell/src/Event.vala"
+#line 688 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp12_) {
-#line 5494 "Event.c"
+#line 5496 "Event.c"
EventSourceCollection* _tmp13_ = NULL;
Event* _tmp14_ = NULL;
-#line 687 "/home/jens/Source/shotwell/src/Event.vala"
+#line 689 "/home/jens/Source/shotwell/src/Event.vala"
_tmp13_ = event_global;
-#line 687 "/home/jens/Source/shotwell/src/Event.vala"
+#line 689 "/home/jens/Source/shotwell/src/Event.vala"
_tmp14_ = event;
-#line 687 "/home/jens/Source/shotwell/src/Event.vala"
+#line 689 "/home/jens/Source/shotwell/src/Event.vala"
data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
-#line 5503 "Event.c"
+#line 5505 "Event.c"
}
-#line 673 "/home/jens/Source/shotwell/src/Event.vala"
+#line 675 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (event);
-#line 5507 "Event.c"
+#line 5509 "Event.c"
}
@@ -5514,28 +5516,28 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_
GeeCollection* _tmp21_ = NULL;
gint _tmp22_ = 0;
gint _tmp23_ = 0;
-#line 690 "/home/jens/Source/shotwell/src/Event.vala"
+#line 692 "/home/jens/Source/shotwell/src/Event.vala"
g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 690 "/home/jens/Source/shotwell/src/Event.vala"
+#line 692 "/home/jens/Source/shotwell/src/Event.vala"
g_return_if_fail (IS_VIEW_COLLECTION (events_so_far));
-#line 691 "/home/jens/Source/shotwell/src/Event.vala"
+#line 693 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 691 "/home/jens/Source/shotwell/src/Event.vala"
+#line 693 "/home/jens/Source/shotwell/src/Event.vala"
to_add = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 5525 "Event.c"
+#line 5527 "Event.c"
{
GeeIterator* _media_it = NULL;
GeeCollection* _tmp1_ = NULL;
GeeIterator* _tmp2_ = NULL;
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
+#line 694 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = sources;
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
+#line 694 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
+#line 694 "/home/jens/Source/shotwell/src/Event.vala"
_media_it = _tmp2_;
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
+#line 694 "/home/jens/Source/shotwell/src/Event.vala"
while (TRUE) {
-#line 5538 "Event.c"
+#line 5540 "Event.c"
GeeIterator* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
MediaSource* media = NULL;
@@ -5555,135 +5557,135 @@ void event_generate_many_events (GeeCollection* sources, ViewCollection* events_
MediaSource* _tmp16_ = NULL;
Event* _tmp17_ = NULL;
gboolean _tmp18_ = FALSE;
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
+#line 694 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = _media_it;
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
+#line 694 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = gee_iterator_next (_tmp3_);
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
+#line 694 "/home/jens/Source/shotwell/src/Event.vala"
if (!_tmp4_) {
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
+#line 694 "/home/jens/Source/shotwell/src/Event.vala"
break;
-#line 5566 "Event.c"
+#line 5568 "Event.c"
}
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
+#line 694 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = _media_it;
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
+#line 694 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = gee_iterator_get (_tmp5_);
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
- media = (MediaSource*) _tmp6_;
#line 694 "/home/jens/Source/shotwell/src/Event.vala"
+ media = (MediaSource*) _tmp6_;
+#line 696 "/home/jens/Source/shotwell/src/Event.vala"
_tmp7_ = media;
-#line 694 "/home/jens/Source/shotwell/src/Event.vala"
+#line 696 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = media_source_get_event (_tmp7_);
-#line 694 "/home/jens/Source/shotwell/src/Event.vala"
+#line 696 "/home/jens/Source/shotwell/src/Event.vala"
_tmp9_ = _tmp8_;
-#line 694 "/home/jens/Source/shotwell/src/Event.vala"
+#line 696 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = _tmp9_ != NULL;
-#line 694 "/home/jens/Source/shotwell/src/Event.vala"
+#line 696 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp9_);
-#line 694 "/home/jens/Source/shotwell/src/Event.vala"
+#line 696 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp10_) {
-#line 695 "/home/jens/Source/shotwell/src/Event.vala"
+#line 697 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (media);
-#line 695 "/home/jens/Source/shotwell/src/Event.vala"
+#line 697 "/home/jens/Source/shotwell/src/Event.vala"
continue;
-#line 5590 "Event.c"
+#line 5592 "Event.c"
}
-#line 698 "/home/jens/Source/shotwell/src/Event.vala"
+#line 700 "/home/jens/Source/shotwell/src/Event.vala"
_tmp11_ = media;
-#line 698 "/home/jens/Source/shotwell/src/Event.vala"
+#line 700 "/home/jens/Source/shotwell/src/Event.vala"
_tmp12_ = events_so_far;
-#line 698 "/home/jens/Source/shotwell/src/Event.vala"
+#line 700 "/home/jens/Source/shotwell/src/Event.vala"
_tmp14_ = event_generate_event (_tmp11_, _tmp12_, NULL, &_tmp13_);
-#line 698 "/home/jens/Source/shotwell/src/Event.vala"
+#line 700 "/home/jens/Source/shotwell/src/Event.vala"
new_event = _tmp13_;
-#line 698 "/home/jens/Source/shotwell/src/Event.vala"
+#line 700 "/home/jens/Source/shotwell/src/Event.vala"
event = _tmp14_;
-#line 699 "/home/jens/Source/shotwell/src/Event.vala"
+#line 701 "/home/jens/Source/shotwell/src/Event.vala"
_tmp15_ = event;
-#line 699 "/home/jens/Source/shotwell/src/Event.vala"
+#line 701 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp15_ == NULL) {
-#line 700 "/home/jens/Source/shotwell/src/Event.vala"
+#line 702 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (event);
-#line 700 "/home/jens/Source/shotwell/src/Event.vala"
+#line 702 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (media);
-#line 700 "/home/jens/Source/shotwell/src/Event.vala"
+#line 702 "/home/jens/Source/shotwell/src/Event.vala"
continue;
-#line 5612 "Event.c"
+#line 5614 "Event.c"
}
-#line 702 "/home/jens/Source/shotwell/src/Event.vala"
+#line 704 "/home/jens/Source/shotwell/src/Event.vala"
_tmp16_ = media;
-#line 702 "/home/jens/Source/shotwell/src/Event.vala"
+#line 704 "/home/jens/Source/shotwell/src/Event.vala"
_tmp17_ = event;
-#line 702 "/home/jens/Source/shotwell/src/Event.vala"
- media_source_set_event (_tmp16_, _tmp17_);
#line 704 "/home/jens/Source/shotwell/src/Event.vala"
+ media_source_set_event (_tmp16_, _tmp17_);
+#line 706 "/home/jens/Source/shotwell/src/Event.vala"
_tmp18_ = new_event;
-#line 704 "/home/jens/Source/shotwell/src/Event.vala"
+#line 706 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp18_) {
-#line 5624 "Event.c"
+#line 5626 "Event.c"
GeeCollection* _tmp19_ = NULL;
Event* _tmp20_ = NULL;
-#line 705 "/home/jens/Source/shotwell/src/Event.vala"
+#line 707 "/home/jens/Source/shotwell/src/Event.vala"
_tmp19_ = to_add;
-#line 705 "/home/jens/Source/shotwell/src/Event.vala"
+#line 707 "/home/jens/Source/shotwell/src/Event.vala"
_tmp20_ = event;
-#line 705 "/home/jens/Source/shotwell/src/Event.vala"
+#line 707 "/home/jens/Source/shotwell/src/Event.vala"
gee_collection_add (_tmp19_, _tmp20_);
-#line 5633 "Event.c"
+#line 5635 "Event.c"
}
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
+#line 694 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (event);
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
+#line 694 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (media);
-#line 5639 "Event.c"
+#line 5641 "Event.c"
}
-#line 692 "/home/jens/Source/shotwell/src/Event.vala"
+#line 694 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_media_it);
-#line 5643 "Event.c"
+#line 5645 "Event.c"
}
-#line 708 "/home/jens/Source/shotwell/src/Event.vala"
+#line 710 "/home/jens/Source/shotwell/src/Event.vala"
_tmp21_ = to_add;
-#line 708 "/home/jens/Source/shotwell/src/Event.vala"
+#line 710 "/home/jens/Source/shotwell/src/Event.vala"
_tmp22_ = gee_collection_get_size (_tmp21_);
-#line 708 "/home/jens/Source/shotwell/src/Event.vala"
+#line 710 "/home/jens/Source/shotwell/src/Event.vala"
_tmp23_ = _tmp22_;
-#line 708 "/home/jens/Source/shotwell/src/Event.vala"
+#line 710 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp23_ > 0) {
-#line 5653 "Event.c"
+#line 5655 "Event.c"
EventSourceCollection* _tmp24_ = NULL;
GeeCollection* _tmp25_ = NULL;
GeeCollection* _tmp26_ = NULL;
GeeCollection* _tmp27_ = NULL;
-#line 709 "/home/jens/Source/shotwell/src/Event.vala"
+#line 711 "/home/jens/Source/shotwell/src/Event.vala"
_tmp24_ = event_global;
-#line 709 "/home/jens/Source/shotwell/src/Event.vala"
+#line 711 "/home/jens/Source/shotwell/src/Event.vala"
_tmp25_ = to_add;
-#line 709 "/home/jens/Source/shotwell/src/Event.vala"
+#line 711 "/home/jens/Source/shotwell/src/Event.vala"
_tmp26_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), _tmp25_, NULL, NULL);
-#line 709 "/home/jens/Source/shotwell/src/Event.vala"
+#line 711 "/home/jens/Source/shotwell/src/Event.vala"
_tmp27_ = _tmp26_;
-#line 709 "/home/jens/Source/shotwell/src/Event.vala"
+#line 711 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp27_);
-#line 5668 "Event.c"
+#line 5670 "Event.c"
}
-#line 690 "/home/jens/Source/shotwell/src/Event.vala"
+#line 692 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (to_add);
-#line 5672 "Event.c"
+#line 5674 "Event.c"
}
void event_get_event_id (Event* self, EventID* result) {
EventID _tmp0_ = {0};
-#line 712 "/home/jens/Source/shotwell/src/Event.vala"
+#line 714 "/home/jens/Source/shotwell/src/Event.vala"
g_return_if_fail (IS_EVENT (self));
-#line 713 "/home/jens/Source/shotwell/src/Event.vala"
+#line 715 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = self->priv->event_id;
-#line 713 "/home/jens/Source/shotwell/src/Event.vala"
+#line 715 "/home/jens/Source/shotwell/src/Event.vala"
*result = _tmp0_;
-#line 713 "/home/jens/Source/shotwell/src/Event.vala"
+#line 715 "/home/jens/Source/shotwell/src/Event.vala"
return;
-#line 5686 "Event.c"
+#line 5688 "Event.c"
}
@@ -5691,15 +5693,15 @@ static SourceSnapshot* event_real_save_snapshot (DataSource* base) {
Event * self;
SourceSnapshot* result = NULL;
EventEventSnapshot* _tmp0_ = NULL;
-#line 716 "/home/jens/Source/shotwell/src/Event.vala"
+#line 718 "/home/jens/Source/shotwell/src/Event.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
-#line 717 "/home/jens/Source/shotwell/src/Event.vala"
+#line 719 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = event_event_snapshot_new (self);
-#line 717 "/home/jens/Source/shotwell/src/Event.vala"
+#line 719 "/home/jens/Source/shotwell/src/Event.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_SNAPSHOT, SourceSnapshot);
-#line 717 "/home/jens/Source/shotwell/src/Event.vala"
+#line 719 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 5702 "Event.c"
+#line 5704 "Event.c"
}
@@ -5707,15 +5709,15 @@ static SourceProxy* event_real_get_proxy (Proxyable* base) {
Event * self;
SourceProxy* result = NULL;
EventEventProxy* _tmp0_ = NULL;
-#line 720 "/home/jens/Source/shotwell/src/Event.vala"
+#line 722 "/home/jens/Source/shotwell/src/Event.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
-#line 721 "/home/jens/Source/shotwell/src/Event.vala"
+#line 723 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = event_event_proxy_new (self);
-#line 721 "/home/jens/Source/shotwell/src/Event.vala"
+#line 723 "/home/jens/Source/shotwell/src/Event.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_PROXY, SourceProxy);
-#line 721 "/home/jens/Source/shotwell/src/Event.vala"
+#line 723 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 5718 "Event.c"
+#line 5720 "Event.c"
}
@@ -5728,58 +5730,58 @@ static gboolean event_real_equals (DataSource* base, DataSource* source) {
Event* _tmp2_ = NULL;
DataSource* _tmp9_ = NULL;
gboolean _tmp10_ = FALSE;
-#line 724 "/home/jens/Source/shotwell/src/Event.vala"
+#line 726 "/home/jens/Source/shotwell/src/Event.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
-#line 724 "/home/jens/Source/shotwell/src/Event.vala"
- g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE);
#line 726 "/home/jens/Source/shotwell/src/Event.vala"
+ g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE);
+#line 728 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = source;
-#line 726 "/home/jens/Source/shotwell/src/Event.vala"
+#line 728 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_EVENT) ? ((Event*) _tmp0_) : NULL);
-#line 726 "/home/jens/Source/shotwell/src/Event.vala"
+#line 728 "/home/jens/Source/shotwell/src/Event.vala"
event = _tmp1_;
-#line 727 "/home/jens/Source/shotwell/src/Event.vala"
+#line 729 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = event;
-#line 727 "/home/jens/Source/shotwell/src/Event.vala"
+#line 729 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp2_ != NULL) {
-#line 5745 "Event.c"
+#line 5747 "Event.c"
Event* _tmp3_ = NULL;
-#line 728 "/home/jens/Source/shotwell/src/Event.vala"
+#line 730 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = event;
-#line 728 "/home/jens/Source/shotwell/src/Event.vala"
+#line 730 "/home/jens/Source/shotwell/src/Event.vala"
if (self != _tmp3_) {
-#line 5751 "Event.c"
+#line 5753 "Event.c"
EventID _tmp4_ = {0};
gint64 _tmp5_ = 0LL;
Event* _tmp6_ = NULL;
EventID _tmp7_ = {0};
gint64 _tmp8_ = 0LL;
-#line 729 "/home/jens/Source/shotwell/src/Event.vala"
+#line 731 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = self->priv->event_id;
-#line 729 "/home/jens/Source/shotwell/src/Event.vala"
+#line 731 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = _tmp4_.id;
-#line 729 "/home/jens/Source/shotwell/src/Event.vala"
+#line 731 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = event;
-#line 729 "/home/jens/Source/shotwell/src/Event.vala"
+#line 731 "/home/jens/Source/shotwell/src/Event.vala"
_tmp7_ = _tmp6_->priv->event_id;
-#line 729 "/home/jens/Source/shotwell/src/Event.vala"
+#line 731 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = _tmp7_.id;
-#line 729 "/home/jens/Source/shotwell/src/Event.vala"
+#line 731 "/home/jens/Source/shotwell/src/Event.vala"
_vala_assert (_tmp5_ != _tmp8_, "event_id.id != event.event_id.id");
-#line 5769 "Event.c"
+#line 5771 "Event.c"
}
}
-#line 733 "/home/jens/Source/shotwell/src/Event.vala"
+#line 735 "/home/jens/Source/shotwell/src/Event.vala"
_tmp9_ = source;
-#line 733 "/home/jens/Source/shotwell/src/Event.vala"
+#line 735 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = DATA_SOURCE_CLASS (event_parent_class)->equals (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource), TYPE_DATA_SOURCE, DataSource), _tmp9_);
-#line 733 "/home/jens/Source/shotwell/src/Event.vala"
+#line 735 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp10_;
-#line 733 "/home/jens/Source/shotwell/src/Event.vala"
+#line 735 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (event);
-#line 733 "/home/jens/Source/shotwell/src/Event.vala"
+#line 735 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 5782 "Event.c"
+#line 5784 "Event.c"
}
@@ -5797,41 +5799,41 @@ static gchar* event_real_to_string (DataObject* base) {
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
gchar* _tmp10_ = NULL;
-#line 736 "/home/jens/Source/shotwell/src/Event.vala"
+#line 738 "/home/jens/Source/shotwell/src/Event.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = self->priv->event_id;
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = _tmp0_.id;
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp1_);
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = _tmp2_;
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = data_object_get_object_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp4_);
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = _tmp5_;
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_tmp7_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = _tmp7_;
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_tmp9_ = g_strdup_printf ("Event [%s/%s] %s", _tmp3_, _tmp6_, _tmp8_);
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = _tmp9_;
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (_tmp8_);
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (_tmp6_);
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (_tmp3_);
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp10_;
-#line 737 "/home/jens/Source/shotwell/src/Event.vala"
+#line 739 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 5834 "Event.c"
+#line 5836 "Event.c"
}
@@ -5839,35 +5841,35 @@ gboolean event_has_name (Event* self) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
const gchar* _tmp1_ = NULL;
-#line 740 "/home/jens/Source/shotwell/src/Event.vala"
+#line 742 "/home/jens/Source/shotwell/src/Event.vala"
g_return_val_if_fail (IS_EVENT (self), FALSE);
-#line 741 "/home/jens/Source/shotwell/src/Event.vala"
+#line 743 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = self->priv->raw_name;
-#line 741 "/home/jens/Source/shotwell/src/Event.vala"
+#line 743 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp1_ != NULL) {
-#line 5848 "Event.c"
+#line 5850 "Event.c"
const gchar* _tmp2_ = NULL;
gint _tmp3_ = 0;
gint _tmp4_ = 0;
-#line 741 "/home/jens/Source/shotwell/src/Event.vala"
+#line 743 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = self->priv->raw_name;
-#line 741 "/home/jens/Source/shotwell/src/Event.vala"
+#line 743 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = strlen (_tmp2_);
-#line 741 "/home/jens/Source/shotwell/src/Event.vala"
+#line 743 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = _tmp3_;
-#line 741 "/home/jens/Source/shotwell/src/Event.vala"
+#line 743 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = _tmp4_ > 0;
-#line 5860 "Event.c"
+#line 5862 "Event.c"
} else {
-#line 741 "/home/jens/Source/shotwell/src/Event.vala"
+#line 743 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = FALSE;
-#line 5864 "Event.c"
+#line 5866 "Event.c"
}
-#line 741 "/home/jens/Source/shotwell/src/Event.vala"
+#line 743 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp0_;
-#line 741 "/home/jens/Source/shotwell/src/Event.vala"
+#line 743 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 5870 "Event.c"
+#line 5872 "Event.c"
}
@@ -5880,44 +5882,44 @@ static gchar* event_real_get_name (DataObject* base) {
gchar* _tmp3_ = NULL;
const gchar* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
-#line 744 "/home/jens/Source/shotwell/src/Event.vala"
+#line 746 "/home/jens/Source/shotwell/src/Event.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
-#line 745 "/home/jens/Source/shotwell/src/Event.vala"
+#line 747 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = event_has_name (self);
-#line 745 "/home/jens/Source/shotwell/src/Event.vala"
+#line 747 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp0_) {
-#line 5889 "Event.c"
+#line 5891 "Event.c"
gchar* _tmp1_ = NULL;
-#line 746 "/home/jens/Source/shotwell/src/Event.vala"
+#line 748 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = event_get_raw_name (self);
-#line 746 "/home/jens/Source/shotwell/src/Event.vala"
+#line 748 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp1_;
-#line 746 "/home/jens/Source/shotwell/src/Event.vala"
+#line 748 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 5897 "Event.c"
+#line 5899 "Event.c"
}
-#line 749 "/home/jens/Source/shotwell/src/Event.vala"
+#line 751 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = event_get_formatted_daterange (self);
-#line 749 "/home/jens/Source/shotwell/src/Event.vala"
- datestring = _tmp2_;
#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+ datestring = _tmp2_;
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = datestring;
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = is_string_empty (_tmp4_);
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
if (!_tmp5_) {
-#line 5909 "Event.c"
+#line 5911 "Event.c"
const gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = datestring;
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_tmp7_ = g_strdup (_tmp6_);
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (_tmp3_);
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = _tmp7_;
-#line 5920 "Event.c"
+#line 5922 "Event.c"
} else {
const gchar* _tmp8_ = NULL;
EventID _tmp9_ = {0};
@@ -5925,33 +5927,33 @@ static gchar* event_real_get_name (DataObject* base) {
gchar* _tmp11_ = NULL;
gchar* _tmp12_ = NULL;
gchar* _tmp13_ = NULL;
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = _ ("Event %s");
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_tmp9_ = self->priv->event_id;
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = _tmp9_.id;
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_tmp11_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp10_);
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_tmp12_ = _tmp11_;
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_tmp13_ = g_strdup_printf (_tmp8_, _tmp12_);
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (_tmp3_);
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = _tmp13_;
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (_tmp12_);
-#line 5946 "Event.c"
+#line 5948 "Event.c"
}
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp3_;
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (datestring);
-#line 751 "/home/jens/Source/shotwell/src/Event.vala"
+#line 753 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 5954 "Event.c"
+#line 5956 "Event.c"
}
@@ -5980,169 +5982,169 @@ gchar* event_get_formatted_daterange (Event* self) {
struct tm _tmp32_ = {0};
struct tm _tmp33_ = {0};
gchar* _tmp34_ = NULL;
-#line 754 "/home/jens/Source/shotwell/src/Event.vala"
+#line 756 "/home/jens/Source/shotwell/src/Event.vala"
g_return_val_if_fail (IS_EVENT (self), NULL);
-#line 755 "/home/jens/Source/shotwell/src/Event.vala"
+#line 757 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource));
-#line 755 "/home/jens/Source/shotwell/src/Event.vala"
+#line 757 "/home/jens/Source/shotwell/src/Event.vala"
start_time = _tmp0_;
-#line 756 "/home/jens/Source/shotwell/src/Event.vala"
+#line 758 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = event_source_get_end_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource));
-#line 756 "/home/jens/Source/shotwell/src/Event.vala"
- end_time = _tmp1_;
#line 758 "/home/jens/Source/shotwell/src/Event.vala"
+ end_time = _tmp1_;
+#line 760 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = end_time;
-#line 758 "/home/jens/Source/shotwell/src/Event.vala"
+#line 760 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp3_ == ((time_t) 0)) {
-#line 5997 "Event.c"
+#line 5999 "Event.c"
time_t _tmp4_ = 0;
-#line 758 "/home/jens/Source/shotwell/src/Event.vala"
+#line 760 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = start_time;
-#line 758 "/home/jens/Source/shotwell/src/Event.vala"
+#line 760 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = _tmp4_ == ((time_t) 0);
-#line 6003 "Event.c"
+#line 6005 "Event.c"
} else {
-#line 758 "/home/jens/Source/shotwell/src/Event.vala"
+#line 760 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = FALSE;
-#line 6007 "Event.c"
+#line 6009 "Event.c"
}
-#line 758 "/home/jens/Source/shotwell/src/Event.vala"
+#line 760 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp2_) {
-#line 759 "/home/jens/Source/shotwell/src/Event.vala"
+#line 761 "/home/jens/Source/shotwell/src/Event.vala"
result = NULL;
-#line 759 "/home/jens/Source/shotwell/src/Event.vala"
+#line 761 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6015 "Event.c"
+#line 6017 "Event.c"
}
-#line 761 "/home/jens/Source/shotwell/src/Event.vala"
+#line 763 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = end_time;
-#line 761 "/home/jens/Source/shotwell/src/Event.vala"
+#line 763 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp6_ == ((time_t) 0)) {
-#line 6021 "Event.c"
+#line 6023 "Event.c"
time_t _tmp7_ = 0;
-#line 761 "/home/jens/Source/shotwell/src/Event.vala"
+#line 763 "/home/jens/Source/shotwell/src/Event.vala"
_tmp7_ = start_time;
-#line 761 "/home/jens/Source/shotwell/src/Event.vala"
+#line 763 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = _tmp7_ != ((time_t) 0);
-#line 6027 "Event.c"
+#line 6029 "Event.c"
} else {
-#line 761 "/home/jens/Source/shotwell/src/Event.vala"
+#line 763 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = FALSE;
-#line 6031 "Event.c"
+#line 6033 "Event.c"
}
-#line 761 "/home/jens/Source/shotwell/src/Event.vala"
+#line 763 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp5_) {
-#line 6035 "Event.c"
+#line 6037 "Event.c"
time_t _tmp8_ = 0;
struct tm _tmp9_ = {0};
gchar* _tmp10_ = NULL;
-#line 762 "/home/jens/Source/shotwell/src/Event.vala"
+#line 764 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = start_time;
-#line 762 "/home/jens/Source/shotwell/src/Event.vala"
+#line 764 "/home/jens/Source/shotwell/src/Event.vala"
g_time_local (_tmp8_, &_tmp9_);
-#line 762 "/home/jens/Source/shotwell/src/Event.vala"
+#line 764 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = format_local_date (&_tmp9_);
-#line 762 "/home/jens/Source/shotwell/src/Event.vala"
+#line 764 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp10_;
-#line 762 "/home/jens/Source/shotwell/src/Event.vala"
+#line 764 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6049 "Event.c"
+#line 6051 "Event.c"
}
-#line 764 "/home/jens/Source/shotwell/src/Event.vala"
+#line 766 "/home/jens/Source/shotwell/src/Event.vala"
_tmp11_ = start_time;
-#line 764 "/home/jens/Source/shotwell/src/Event.vala"
+#line 766 "/home/jens/Source/shotwell/src/Event.vala"
g_time_local (_tmp11_, &_tmp12_);
-#line 764 "/home/jens/Source/shotwell/src/Event.vala"
+#line 766 "/home/jens/Source/shotwell/src/Event.vala"
start = _tmp12_;
-#line 765 "/home/jens/Source/shotwell/src/Event.vala"
+#line 767 "/home/jens/Source/shotwell/src/Event.vala"
_tmp13_ = end_time;
-#line 765 "/home/jens/Source/shotwell/src/Event.vala"
+#line 767 "/home/jens/Source/shotwell/src/Event.vala"
g_time_local (_tmp13_, &_tmp14_);
-#line 765 "/home/jens/Source/shotwell/src/Event.vala"
- end = _tmp14_;
#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+ end = _tmp14_;
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp17_ = start;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp18_ = _tmp17_.tm_mday;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp19_ = end;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp20_ = _tmp19_.tm_mday;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp18_ == _tmp20_) {
-#line 6073 "Event.c"
+#line 6075 "Event.c"
struct tm _tmp21_ = {0};
gint _tmp22_ = 0;
struct tm _tmp23_ = {0};
gint _tmp24_ = 0;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp21_ = start;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp22_ = _tmp21_.tm_mon;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp23_ = end;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp24_ = _tmp23_.tm_mon;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp16_ = _tmp22_ == _tmp24_;
-#line 6088 "Event.c"
+#line 6090 "Event.c"
} else {
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp16_ = FALSE;
-#line 6092 "Event.c"
+#line 6094 "Event.c"
}
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp16_) {
-#line 6096 "Event.c"
+#line 6098 "Event.c"
struct tm _tmp25_ = {0};
gint _tmp26_ = 0;
struct tm _tmp27_ = {0};
gint _tmp28_ = 0;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp25_ = start;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp26_ = _tmp25_.tm_mday;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp27_ = end;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp28_ = _tmp27_.tm_mday;
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp15_ = _tmp26_ == _tmp28_;
-#line 6111 "Event.c"
+#line 6113 "Event.c"
} else {
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
_tmp15_ = FALSE;
-#line 6115 "Event.c"
+#line 6117 "Event.c"
}
-#line 767 "/home/jens/Source/shotwell/src/Event.vala"
+#line 769 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp15_) {
-#line 6119 "Event.c"
+#line 6121 "Event.c"
time_t _tmp29_ = 0;
struct tm _tmp30_ = {0};
gchar* _tmp31_ = NULL;
-#line 768 "/home/jens/Source/shotwell/src/Event.vala"
+#line 770 "/home/jens/Source/shotwell/src/Event.vala"
_tmp29_ = start_time;
-#line 768 "/home/jens/Source/shotwell/src/Event.vala"
+#line 770 "/home/jens/Source/shotwell/src/Event.vala"
g_time_local (_tmp29_, &_tmp30_);
-#line 768 "/home/jens/Source/shotwell/src/Event.vala"
+#line 770 "/home/jens/Source/shotwell/src/Event.vala"
_tmp31_ = format_local_date (&_tmp30_);
-#line 768 "/home/jens/Source/shotwell/src/Event.vala"
+#line 770 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp31_;
-#line 768 "/home/jens/Source/shotwell/src/Event.vala"
+#line 770 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6133 "Event.c"
+#line 6135 "Event.c"
}
-#line 770 "/home/jens/Source/shotwell/src/Event.vala"
+#line 772 "/home/jens/Source/shotwell/src/Event.vala"
_tmp32_ = start;
-#line 770 "/home/jens/Source/shotwell/src/Event.vala"
+#line 772 "/home/jens/Source/shotwell/src/Event.vala"
_tmp33_ = end;
-#line 770 "/home/jens/Source/shotwell/src/Event.vala"
+#line 772 "/home/jens/Source/shotwell/src/Event.vala"
_tmp34_ = format_local_datespan (&_tmp32_, &_tmp33_);
-#line 770 "/home/jens/Source/shotwell/src/Event.vala"
+#line 772 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp34_;
-#line 770 "/home/jens/Source/shotwell/src/Event.vala"
+#line 772 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6145 "Event.c"
+#line 6147 "Event.c"
}
@@ -6150,17 +6152,17 @@ gchar* event_get_raw_name (Event* self) {
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 773 "/home/jens/Source/shotwell/src/Event.vala"
+#line 775 "/home/jens/Source/shotwell/src/Event.vala"
g_return_val_if_fail (IS_EVENT (self), NULL);
-#line 774 "/home/jens/Source/shotwell/src/Event.vala"
+#line 776 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = self->priv->raw_name;
-#line 774 "/home/jens/Source/shotwell/src/Event.vala"
+#line 776 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 774 "/home/jens/Source/shotwell/src/Event.vala"
+#line 776 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp1_;
-#line 774 "/home/jens/Source/shotwell/src/Event.vala"
+#line 776 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6163 "Event.c"
+#line 6165 "Event.c"
}
@@ -6169,17 +6171,17 @@ static gchar* event_real_get_comment (EventSource* base) {
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/Event.vala"
+#line 779 "/home/jens/Source/shotwell/src/Event.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
-#line 778 "/home/jens/Source/shotwell/src/Event.vala"
+#line 780 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = self->priv->comment;
-#line 778 "/home/jens/Source/shotwell/src/Event.vala"
+#line 780 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 778 "/home/jens/Source/shotwell/src/Event.vala"
+#line 780 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp1_;
-#line 778 "/home/jens/Source/shotwell/src/Event.vala"
+#line 780 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6182 "Event.c"
+#line 6184 "Event.c"
}
@@ -6198,82 +6200,82 @@ gboolean event_rename (Event* self, const gchar* name) {
const gchar* _tmp9_ = NULL;
gboolean _tmp10_ = FALSE;
gboolean _tmp11_ = FALSE;
-#line 781 "/home/jens/Source/shotwell/src/Event.vala"
+#line 783 "/home/jens/Source/shotwell/src/Event.vala"
g_return_val_if_fail (IS_EVENT (self), FALSE);
-#line 782 "/home/jens/Source/shotwell/src/Event.vala"
+#line 784 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = name;
-#line 782 "/home/jens/Source/shotwell/src/Event.vala"
+#line 784 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = event_prep_event_name (_tmp0_);
-#line 782 "/home/jens/Source/shotwell/src/Event.vala"
+#line 784 "/home/jens/Source/shotwell/src/Event.vala"
new_name = _tmp1_;
-#line 785 "/home/jens/Source/shotwell/src/Event.vala"
+#line 787 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = new_name;
-#line 785 "/home/jens/Source/shotwell/src/Event.vala"
+#line 787 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = event_get_formatted_daterange (self);
-#line 785 "/home/jens/Source/shotwell/src/Event.vala"
+#line 787 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = _tmp3_;
-#line 785 "/home/jens/Source/shotwell/src/Event.vala"
+#line 787 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = g_strcmp0 (_tmp2_, _tmp4_) == 0;
-#line 785 "/home/jens/Source/shotwell/src/Event.vala"
+#line 787 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (_tmp4_);
-#line 785 "/home/jens/Source/shotwell/src/Event.vala"
+#line 787 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp5_) {
-#line 6221 "Event.c"
+#line 6223 "Event.c"
gchar* _tmp6_ = NULL;
-#line 786 "/home/jens/Source/shotwell/src/Event.vala"
+#line 788 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = g_strdup ("");
-#line 786 "/home/jens/Source/shotwell/src/Event.vala"
+#line 788 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (new_name);
-#line 786 "/home/jens/Source/shotwell/src/Event.vala"
+#line 788 "/home/jens/Source/shotwell/src/Event.vala"
new_name = _tmp6_;
-#line 6229 "Event.c"
+#line 6231 "Event.c"
}
-#line 789 "/home/jens/Source/shotwell/src/Event.vala"
+#line 791 "/home/jens/Source/shotwell/src/Event.vala"
_tmp7_ = event_event_table;
-#line 789 "/home/jens/Source/shotwell/src/Event.vala"
+#line 791 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = self->priv->event_id;
-#line 789 "/home/jens/Source/shotwell/src/Event.vala"
+#line 791 "/home/jens/Source/shotwell/src/Event.vala"
_tmp9_ = new_name;
-#line 789 "/home/jens/Source/shotwell/src/Event.vala"
+#line 791 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = event_table_rename (_tmp7_, &_tmp8_, _tmp9_);
-#line 789 "/home/jens/Source/shotwell/src/Event.vala"
+#line 791 "/home/jens/Source/shotwell/src/Event.vala"
renamed = _tmp10_;
-#line 790 "/home/jens/Source/shotwell/src/Event.vala"
+#line 792 "/home/jens/Source/shotwell/src/Event.vala"
_tmp11_ = renamed;
-#line 790 "/home/jens/Source/shotwell/src/Event.vala"
+#line 792 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp11_) {
-#line 6245 "Event.c"
+#line 6247 "Event.c"
const gchar* _tmp12_ = NULL;
gchar* _tmp13_ = NULL;
Alteration* _tmp14_ = NULL;
Alteration* _tmp15_ = NULL;
-#line 791 "/home/jens/Source/shotwell/src/Event.vala"
+#line 793 "/home/jens/Source/shotwell/src/Event.vala"
_tmp12_ = new_name;
-#line 791 "/home/jens/Source/shotwell/src/Event.vala"
+#line 793 "/home/jens/Source/shotwell/src/Event.vala"
_tmp13_ = g_strdup (_tmp12_);
-#line 791 "/home/jens/Source/shotwell/src/Event.vala"
+#line 793 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (self->priv->raw_name);
-#line 791 "/home/jens/Source/shotwell/src/Event.vala"
+#line 793 "/home/jens/Source/shotwell/src/Event.vala"
self->priv->raw_name = _tmp13_;
-#line 792 "/home/jens/Source/shotwell/src/Event.vala"
+#line 794 "/home/jens/Source/shotwell/src/Event.vala"
event_update_indexable_keywords (self);
-#line 793 "/home/jens/Source/shotwell/src/Event.vala"
+#line 795 "/home/jens/Source/shotwell/src/Event.vala"
_tmp14_ = alteration_new_from_list ("metadata:name, indexable:keywords");
-#line 793 "/home/jens/Source/shotwell/src/Event.vala"
+#line 795 "/home/jens/Source/shotwell/src/Event.vala"
_tmp15_ = _tmp14_;
-#line 793 "/home/jens/Source/shotwell/src/Event.vala"
+#line 795 "/home/jens/Source/shotwell/src/Event.vala"
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_);
-#line 793 "/home/jens/Source/shotwell/src/Event.vala"
+#line 795 "/home/jens/Source/shotwell/src/Event.vala"
_alteration_unref0 (_tmp15_);
-#line 6268 "Event.c"
+#line 6270 "Event.c"
}
-#line 796 "/home/jens/Source/shotwell/src/Event.vala"
+#line 798 "/home/jens/Source/shotwell/src/Event.vala"
result = renamed;
-#line 796 "/home/jens/Source/shotwell/src/Event.vala"
+#line 798 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (new_name);
-#line 796 "/home/jens/Source/shotwell/src/Event.vala"
+#line 798 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6276 "Event.c"
+#line 6278 "Event.c"
}
@@ -6289,60 +6291,60 @@ static gboolean event_real_set_comment (EventSource* base, const gchar* comment)
const gchar* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
gboolean _tmp6_ = FALSE;
-#line 799 "/home/jens/Source/shotwell/src/Event.vala"
+#line 801 "/home/jens/Source/shotwell/src/Event.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
-#line 800 "/home/jens/Source/shotwell/src/Event.vala"
+#line 802 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = comment;
-#line 800 "/home/jens/Source/shotwell/src/Event.vala"
+#line 802 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = media_source_prep_comment (_tmp0_);
-#line 800 "/home/jens/Source/shotwell/src/Event.vala"
- new_comment = _tmp1_;
#line 802 "/home/jens/Source/shotwell/src/Event.vala"
+ new_comment = _tmp1_;
+#line 804 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = event_event_table;
-#line 802 "/home/jens/Source/shotwell/src/Event.vala"
+#line 804 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = self->priv->event_id;
-#line 802 "/home/jens/Source/shotwell/src/Event.vala"
+#line 804 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = new_comment;
-#line 802 "/home/jens/Source/shotwell/src/Event.vala"
+#line 804 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = event_table_set_comment (_tmp2_, &_tmp3_, _tmp4_);
-#line 802 "/home/jens/Source/shotwell/src/Event.vala"
+#line 804 "/home/jens/Source/shotwell/src/Event.vala"
committed = _tmp5_;
-#line 803 "/home/jens/Source/shotwell/src/Event.vala"
+#line 805 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = committed;
-#line 803 "/home/jens/Source/shotwell/src/Event.vala"
+#line 805 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp6_) {
-#line 6314 "Event.c"
+#line 6316 "Event.c"
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
Alteration* _tmp9_ = NULL;
Alteration* _tmp10_ = NULL;
-#line 804 "/home/jens/Source/shotwell/src/Event.vala"
+#line 806 "/home/jens/Source/shotwell/src/Event.vala"
_tmp7_ = new_comment;
-#line 804 "/home/jens/Source/shotwell/src/Event.vala"
+#line 806 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = g_strdup (_tmp7_);
-#line 804 "/home/jens/Source/shotwell/src/Event.vala"
+#line 806 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (self->priv->comment);
-#line 804 "/home/jens/Source/shotwell/src/Event.vala"
+#line 806 "/home/jens/Source/shotwell/src/Event.vala"
self->priv->comment = _tmp8_;
-#line 805 "/home/jens/Source/shotwell/src/Event.vala"
+#line 807 "/home/jens/Source/shotwell/src/Event.vala"
event_update_indexable_keywords (self);
-#line 806 "/home/jens/Source/shotwell/src/Event.vala"
+#line 808 "/home/jens/Source/shotwell/src/Event.vala"
_tmp9_ = alteration_new_from_list ("metadata:comment, indexable:keywords");
-#line 806 "/home/jens/Source/shotwell/src/Event.vala"
+#line 808 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = _tmp9_;
-#line 806 "/home/jens/Source/shotwell/src/Event.vala"
+#line 808 "/home/jens/Source/shotwell/src/Event.vala"
data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp10_);
-#line 806 "/home/jens/Source/shotwell/src/Event.vala"
+#line 808 "/home/jens/Source/shotwell/src/Event.vala"
_alteration_unref0 (_tmp10_);
-#line 6337 "Event.c"
+#line 6339 "Event.c"
}
-#line 809 "/home/jens/Source/shotwell/src/Event.vala"
+#line 811 "/home/jens/Source/shotwell/src/Event.vala"
result = committed;
-#line 809 "/home/jens/Source/shotwell/src/Event.vala"
+#line 811 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (new_comment);
-#line 809 "/home/jens/Source/shotwell/src/Event.vala"
+#line 811 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6345 "Event.c"
+#line 6347 "Event.c"
}
@@ -6351,19 +6353,19 @@ time_t event_get_creation_time (Event* self) {
EventTable* _tmp0_ = NULL;
EventID _tmp1_ = {0};
time_t _tmp2_ = 0;
-#line 812 "/home/jens/Source/shotwell/src/Event.vala"
+#line 814 "/home/jens/Source/shotwell/src/Event.vala"
g_return_val_if_fail (IS_EVENT (self), 0);
-#line 813 "/home/jens/Source/shotwell/src/Event.vala"
+#line 815 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = event_event_table;
-#line 813 "/home/jens/Source/shotwell/src/Event.vala"
+#line 815 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = self->priv->event_id;
-#line 813 "/home/jens/Source/shotwell/src/Event.vala"
+#line 815 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = event_table_get_time_created (_tmp0_, &_tmp1_);
-#line 813 "/home/jens/Source/shotwell/src/Event.vala"
+#line 815 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp2_;
-#line 813 "/home/jens/Source/shotwell/src/Event.vala"
+#line 815 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6366 "Event.c"
+#line 6368 "Event.c"
}
@@ -6373,27 +6375,27 @@ static time_t event_real_get_start_time (EventSource* base) {
gint count = 0;
ViewCollection* _tmp0_ = NULL;
gint _tmp1_ = 0;
-#line 816 "/home/jens/Source/shotwell/src/Event.vala"
+#line 818 "/home/jens/Source/shotwell/src/Event.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
-#line 819 "/home/jens/Source/shotwell/src/Event.vala"
+#line 821 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = self->priv->view;
-#line 819 "/home/jens/Source/shotwell/src/Event.vala"
+#line 821 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
-#line 819 "/home/jens/Source/shotwell/src/Event.vala"
+#line 821 "/home/jens/Source/shotwell/src/Event.vala"
count = _tmp1_;
-#line 6384 "Event.c"
+#line 6386 "Event.c"
{
gint i = 0;
-#line 820 "/home/jens/Source/shotwell/src/Event.vala"
+#line 822 "/home/jens/Source/shotwell/src/Event.vala"
i = 0;
-#line 6389 "Event.c"
+#line 6391 "Event.c"
{
gboolean _tmp2_ = FALSE;
-#line 820 "/home/jens/Source/shotwell/src/Event.vala"
+#line 822 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = TRUE;
-#line 820 "/home/jens/Source/shotwell/src/Event.vala"
+#line 822 "/home/jens/Source/shotwell/src/Event.vala"
while (TRUE) {
-#line 6396 "Event.c"
+#line 6398 "Event.c"
gint _tmp4_ = 0;
gint _tmp5_ = 0;
time_t time = 0;
@@ -6406,68 +6408,68 @@ static time_t event_real_get_start_time (EventSource* base) {
time_t _tmp12_ = 0;
time_t _tmp13_ = 0;
time_t _tmp14_ = 0;
-#line 820 "/home/jens/Source/shotwell/src/Event.vala"
+#line 822 "/home/jens/Source/shotwell/src/Event.vala"
if (!_tmp2_) {
-#line 6411 "Event.c"
+#line 6413 "Event.c"
gint _tmp3_ = 0;
-#line 820 "/home/jens/Source/shotwell/src/Event.vala"
+#line 822 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = i;
-#line 820 "/home/jens/Source/shotwell/src/Event.vala"
+#line 822 "/home/jens/Source/shotwell/src/Event.vala"
i = _tmp3_ + 1;
-#line 6417 "Event.c"
+#line 6419 "Event.c"
}
-#line 820 "/home/jens/Source/shotwell/src/Event.vala"
+#line 822 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = FALSE;
-#line 820 "/home/jens/Source/shotwell/src/Event.vala"
+#line 822 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = i;
-#line 820 "/home/jens/Source/shotwell/src/Event.vala"
+#line 822 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = count;
-#line 820 "/home/jens/Source/shotwell/src/Event.vala"
+#line 822 "/home/jens/Source/shotwell/src/Event.vala"
if (!(_tmp4_ < _tmp5_)) {
-#line 820 "/home/jens/Source/shotwell/src/Event.vala"
+#line 822 "/home/jens/Source/shotwell/src/Event.vala"
break;
-#line 6429 "Event.c"
+#line 6431 "Event.c"
}
-#line 821 "/home/jens/Source/shotwell/src/Event.vala"
+#line 823 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = self->priv->view;
-#line 821 "/home/jens/Source/shotwell/src/Event.vala"
+#line 823 "/home/jens/Source/shotwell/src/Event.vala"
_tmp7_ = i;
-#line 821 "/home/jens/Source/shotwell/src/Event.vala"
+#line 823 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_);
-#line 821 "/home/jens/Source/shotwell/src/Event.vala"
+#line 823 "/home/jens/Source/shotwell/src/Event.vala"
_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView);
-#line 821 "/home/jens/Source/shotwell/src/Event.vala"
+#line 823 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = data_view_get_source (_tmp9_);
-#line 821 "/home/jens/Source/shotwell/src/Event.vala"
+#line 823 "/home/jens/Source/shotwell/src/Event.vala"
_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 821 "/home/jens/Source/shotwell/src/Event.vala"
+#line 823 "/home/jens/Source/shotwell/src/Event.vala"
_tmp12_ = media_source_get_exposure_time (_tmp11_);
-#line 821 "/home/jens/Source/shotwell/src/Event.vala"
+#line 823 "/home/jens/Source/shotwell/src/Event.vala"
_tmp13_ = _tmp12_;
-#line 821 "/home/jens/Source/shotwell/src/Event.vala"
+#line 823 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp11_);
-#line 821 "/home/jens/Source/shotwell/src/Event.vala"
+#line 823 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp9_);
-#line 821 "/home/jens/Source/shotwell/src/Event.vala"
+#line 823 "/home/jens/Source/shotwell/src/Event.vala"
time = _tmp13_;
-#line 822 "/home/jens/Source/shotwell/src/Event.vala"
+#line 824 "/home/jens/Source/shotwell/src/Event.vala"
_tmp14_ = time;
-#line 822 "/home/jens/Source/shotwell/src/Event.vala"
+#line 824 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp14_ != ((time_t) 0)) {
-#line 823 "/home/jens/Source/shotwell/src/Event.vala"
+#line 825 "/home/jens/Source/shotwell/src/Event.vala"
result = time;
-#line 823 "/home/jens/Source/shotwell/src/Event.vala"
+#line 825 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6461 "Event.c"
+#line 6463 "Event.c"
}
}
}
}
-#line 826 "/home/jens/Source/shotwell/src/Event.vala"
+#line 828 "/home/jens/Source/shotwell/src/Event.vala"
result = (time_t) 0;
-#line 826 "/home/jens/Source/shotwell/src/Event.vala"
+#line 828 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6470 "Event.c"
+#line 6472 "Event.c"
}
@@ -6486,49 +6488,49 @@ static time_t event_real_get_end_time (EventSource* base) {
MediaSource* _tmp8_ = NULL;
time_t _tmp9_ = 0;
time_t _tmp10_ = 0;
-#line 829 "/home/jens/Source/shotwell/src/Event.vala"
+#line 831 "/home/jens/Source/shotwell/src/Event.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
-#line 830 "/home/jens/Source/shotwell/src/Event.vala"
+#line 832 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = self->priv->view;
-#line 830 "/home/jens/Source/shotwell/src/Event.vala"
+#line 832 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
-#line 830 "/home/jens/Source/shotwell/src/Event.vala"
+#line 832 "/home/jens/Source/shotwell/src/Event.vala"
count = _tmp1_;
-#line 834 "/home/jens/Source/shotwell/src/Event.vala"
+#line 836 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = count;
-#line 834 "/home/jens/Source/shotwell/src/Event.vala"
+#line 836 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp2_ == 0) {
-#line 835 "/home/jens/Source/shotwell/src/Event.vala"
+#line 837 "/home/jens/Source/shotwell/src/Event.vala"
result = (time_t) 0;
-#line 835 "/home/jens/Source/shotwell/src/Event.vala"
+#line 837 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6505 "Event.c"
+#line 6507 "Event.c"
}
-#line 837 "/home/jens/Source/shotwell/src/Event.vala"
+#line 839 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = self->priv->view;
-#line 837 "/home/jens/Source/shotwell/src/Event.vala"
+#line 839 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = count;
-#line 837 "/home/jens/Source/shotwell/src/Event.vala"
+#line 839 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), _tmp4_ - 1);
-#line 837 "/home/jens/Source/shotwell/src/Event.vala"
+#line 839 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_VIEW, DataView);
-#line 837 "/home/jens/Source/shotwell/src/Event.vala"
+#line 839 "/home/jens/Source/shotwell/src/Event.vala"
_tmp7_ = data_view_get_source (_tmp6_);
-#line 837 "/home/jens/Source/shotwell/src/Event.vala"
+#line 839 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 837 "/home/jens/Source/shotwell/src/Event.vala"
+#line 839 "/home/jens/Source/shotwell/src/Event.vala"
_tmp9_ = media_source_get_exposure_time (_tmp8_);
-#line 837 "/home/jens/Source/shotwell/src/Event.vala"
+#line 839 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = _tmp9_;
-#line 837 "/home/jens/Source/shotwell/src/Event.vala"
+#line 839 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp8_);
-#line 837 "/home/jens/Source/shotwell/src/Event.vala"
+#line 839 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp6_);
-#line 837 "/home/jens/Source/shotwell/src/Event.vala"
+#line 839 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp10_;
-#line 837 "/home/jens/Source/shotwell/src/Event.vala"
+#line 839 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6531 "Event.c"
+#line 6533 "Event.c"
}
@@ -6536,32 +6538,32 @@ static guint64 event_real_get_total_filesize (EventSource* base) {
Event * self;
guint64 result = 0ULL;
guint64 total = 0ULL;
-#line 840 "/home/jens/Source/shotwell/src/Event.vala"
+#line 842 "/home/jens/Source/shotwell/src/Event.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
-#line 841 "/home/jens/Source/shotwell/src/Event.vala"
+#line 843 "/home/jens/Source/shotwell/src/Event.vala"
total = (guint64) 0;
-#line 6543 "Event.c"
+#line 6545 "Event.c"
{
GeeIterator* _current_source_it = NULL;
GeeCollection* _tmp0_ = NULL;
GeeCollection* _tmp1_ = NULL;
GeeIterator* _tmp2_ = NULL;
GeeIterator* _tmp3_ = NULL;
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = event_source_get_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource));
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = _tmp0_;
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = _tmp2_;
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp1_);
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
_current_source_it = _tmp3_;
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
while (TRUE) {
-#line 6564 "Event.c"
+#line 6566 "Event.c"
GeeIterator* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
MediaSource* current_source = NULL;
@@ -6570,43 +6572,43 @@ static guint64 event_real_get_total_filesize (EventSource* base) {
guint64 _tmp8_ = 0ULL;
MediaSource* _tmp9_ = NULL;
guint64 _tmp10_ = 0ULL;
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = _current_source_it;
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = gee_iterator_next (_tmp4_);
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
if (!_tmp5_) {
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
break;
-#line 6581 "Event.c"
+#line 6583 "Event.c"
}
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = _current_source_it;
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
_tmp7_ = gee_iterator_get (_tmp6_);
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
current_source = (MediaSource*) _tmp7_;
-#line 843 "/home/jens/Source/shotwell/src/Event.vala"
+#line 845 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = total;
-#line 843 "/home/jens/Source/shotwell/src/Event.vala"
+#line 845 "/home/jens/Source/shotwell/src/Event.vala"
_tmp9_ = current_source;
-#line 843 "/home/jens/Source/shotwell/src/Event.vala"
+#line 845 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = media_source_get_filesize (_tmp9_);
-#line 843 "/home/jens/Source/shotwell/src/Event.vala"
+#line 845 "/home/jens/Source/shotwell/src/Event.vala"
total = _tmp8_ + _tmp10_;
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (current_source);
-#line 6599 "Event.c"
+#line 6601 "Event.c"
}
-#line 842 "/home/jens/Source/shotwell/src/Event.vala"
+#line 844 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_current_source_it);
-#line 6603 "Event.c"
+#line 6605 "Event.c"
}
-#line 846 "/home/jens/Source/shotwell/src/Event.vala"
+#line 848 "/home/jens/Source/shotwell/src/Event.vala"
result = total;
-#line 846 "/home/jens/Source/shotwell/src/Event.vala"
+#line 848 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6609 "Event.c"
+#line 6611 "Event.c"
}
@@ -6615,17 +6617,17 @@ static gint event_real_get_media_count (EventSource* base) {
gint result = 0;
ViewCollection* _tmp0_ = NULL;
gint _tmp1_ = 0;
-#line 849 "/home/jens/Source/shotwell/src/Event.vala"
+#line 851 "/home/jens/Source/shotwell/src/Event.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
-#line 850 "/home/jens/Source/shotwell/src/Event.vala"
+#line 852 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = self->priv->view;
-#line 850 "/home/jens/Source/shotwell/src/Event.vala"
+#line 852 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
-#line 850 "/home/jens/Source/shotwell/src/Event.vala"
+#line 852 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp1_;
-#line 850 "/home/jens/Source/shotwell/src/Event.vala"
+#line 852 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6628 "Event.c"
+#line 6630 "Event.c"
}
@@ -6634,17 +6636,17 @@ static GeeCollection* event_real_get_media (EventSource* base) {
GeeCollection* result = NULL;
ViewCollection* _tmp0_ = NULL;
GeeCollection* _tmp1_ = NULL;
-#line 853 "/home/jens/Source/shotwell/src/Event.vala"
+#line 855 "/home/jens/Source/shotwell/src/Event.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
-#line 854 "/home/jens/Source/shotwell/src/Event.vala"
+#line 856 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = self->priv->view;
-#line 854 "/home/jens/Source/shotwell/src/Event.vala"
+#line 856 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = view_collection_get_sources (_tmp0_);
-#line 854 "/home/jens/Source/shotwell/src/Event.vala"
+#line 856 "/home/jens/Source/shotwell/src/Event.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 854 "/home/jens/Source/shotwell/src/Event.vala"
+#line 856 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6647 "Event.c"
+#line 6649 "Event.c"
}
@@ -6653,30 +6655,30 @@ void event_mirror_photos (Event* self, ViewCollection* view, CreateView mirrorin
ViewCollection* _tmp1_ = NULL;
CreateView _tmp2_ = NULL;
void* _tmp2__target = NULL;
-#line 857 "/home/jens/Source/shotwell/src/Event.vala"
+#line 859 "/home/jens/Source/shotwell/src/Event.vala"
g_return_if_fail (IS_EVENT (self));
-#line 857 "/home/jens/Source/shotwell/src/Event.vala"
+#line 859 "/home/jens/Source/shotwell/src/Event.vala"
g_return_if_fail (IS_VIEW_COLLECTION (view));
-#line 858 "/home/jens/Source/shotwell/src/Event.vala"
+#line 860 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = view;
-#line 858 "/home/jens/Source/shotwell/src/Event.vala"
+#line 860 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = self->priv->view;
-#line 858 "/home/jens/Source/shotwell/src/Event.vala"
+#line 860 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = mirroring_ctor;
-#line 858 "/home/jens/Source/shotwell/src/Event.vala"
+#line 860 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2__target = mirroring_ctor_target;
-#line 858 "/home/jens/Source/shotwell/src/Event.vala"
+#line 860 "/home/jens/Source/shotwell/src/Event.vala"
view_collection_mirror (_tmp0_, _tmp1_, _tmp2_, _tmp2__target, NULL, NULL);
-#line 6670 "Event.c"
+#line 6672 "Event.c"
}
static void event_on_primary_thumbnail_altered (Event* self) {
-#line 861 "/home/jens/Source/shotwell/src/Event.vala"
+#line 863 "/home/jens/Source/shotwell/src/Event.vala"
g_return_if_fail (IS_EVENT (self));
-#line 862 "/home/jens/Source/shotwell/src/Event.vala"
+#line 864 "/home/jens/Source/shotwell/src/Event.vala"
thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 6679 "Event.c"
+#line 6681 "Event.c"
}
@@ -6684,17 +6686,17 @@ MediaSource* event_get_primary_source (Event* self) {
MediaSource* result = NULL;
MediaSource* _tmp0_ = NULL;
MediaSource* _tmp1_ = NULL;
-#line 865 "/home/jens/Source/shotwell/src/Event.vala"
+#line 867 "/home/jens/Source/shotwell/src/Event.vala"
g_return_val_if_fail (IS_EVENT (self), NULL);
-#line 866 "/home/jens/Source/shotwell/src/Event.vala"
+#line 868 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = self->priv->primary_source;
-#line 866 "/home/jens/Source/shotwell/src/Event.vala"
+#line 868 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 866 "/home/jens/Source/shotwell/src/Event.vala"
+#line 868 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp1_;
-#line 866 "/home/jens/Source/shotwell/src/Event.vala"
+#line 868 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6697 "Event.c"
+#line 6699 "Event.c"
}
@@ -6712,81 +6714,81 @@ gboolean event_set_primary_source (Event* self, MediaSource* source) {
gboolean _tmp8_ = FALSE;
gboolean _tmp9_ = FALSE;
gboolean _tmp10_ = FALSE;
-#line 869 "/home/jens/Source/shotwell/src/Event.vala"
+#line 871 "/home/jens/Source/shotwell/src/Event.vala"
g_return_val_if_fail (IS_EVENT (self), FALSE);
-#line 869 "/home/jens/Source/shotwell/src/Event.vala"
+#line 871 "/home/jens/Source/shotwell/src/Event.vala"
g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE);
-#line 870 "/home/jens/Source/shotwell/src/Event.vala"
+#line 872 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = self->priv->view;
-#line 870 "/home/jens/Source/shotwell/src/Event.vala"
+#line 872 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = source;
-#line 870 "/home/jens/Source/shotwell/src/Event.vala"
+#line 872 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = view_collection_has_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource));
-#line 870 "/home/jens/Source/shotwell/src/Event.vala"
- _vala_assert (_tmp2_, "view.has_view_for_source(source)");
#line 872 "/home/jens/Source/shotwell/src/Event.vala"
+ _vala_assert (_tmp2_, "view.has_view_for_source(source)");
+#line 874 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = event_event_table;
-#line 872 "/home/jens/Source/shotwell/src/Event.vala"
+#line 874 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = self->priv->event_id;
-#line 872 "/home/jens/Source/shotwell/src/Event.vala"
+#line 874 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = source;
-#line 872 "/home/jens/Source/shotwell/src/Event.vala"
+#line 874 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = data_source_get_source_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource));
-#line 872 "/home/jens/Source/shotwell/src/Event.vala"
+#line 874 "/home/jens/Source/shotwell/src/Event.vala"
_tmp7_ = _tmp6_;
-#line 872 "/home/jens/Source/shotwell/src/Event.vala"
+#line 874 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = event_table_set_primary_source_id (_tmp3_, &_tmp4_, _tmp7_);
-#line 872 "/home/jens/Source/shotwell/src/Event.vala"
+#line 874 "/home/jens/Source/shotwell/src/Event.vala"
_tmp9_ = _tmp8_;
-#line 872 "/home/jens/Source/shotwell/src/Event.vala"
+#line 874 "/home/jens/Source/shotwell/src/Event.vala"
_g_free0 (_tmp7_);
-#line 872 "/home/jens/Source/shotwell/src/Event.vala"
+#line 874 "/home/jens/Source/shotwell/src/Event.vala"
committed = _tmp9_;
-#line 873 "/home/jens/Source/shotwell/src/Event.vala"
+#line 875 "/home/jens/Source/shotwell/src/Event.vala"
_tmp10_ = committed;
-#line 873 "/home/jens/Source/shotwell/src/Event.vala"
+#line 875 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp10_) {
-#line 6749 "Event.c"
+#line 6751 "Event.c"
MediaSource* _tmp11_ = NULL;
MediaSource* _tmp14_ = NULL;
MediaSource* _tmp15_ = NULL;
MediaSource* _tmp16_ = NULL;
-#line 875 "/home/jens/Source/shotwell/src/Event.vala"
+#line 877 "/home/jens/Source/shotwell/src/Event.vala"
_tmp11_ = self->priv->primary_source;
-#line 875 "/home/jens/Source/shotwell/src/Event.vala"
+#line 877 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp11_ != NULL) {
-#line 6758 "Event.c"
+#line 6760 "Event.c"
MediaSource* _tmp12_ = NULL;
guint _tmp13_ = 0U;
-#line 876 "/home/jens/Source/shotwell/src/Event.vala"
+#line 878 "/home/jens/Source/shotwell/src/Event.vala"
_tmp12_ = self->priv->primary_source;
-#line 876 "/home/jens/Source/shotwell/src/Event.vala"
+#line 878 "/home/jens/Source/shotwell/src/Event.vala"
g_signal_parse_name ("thumbnail-altered", TYPE_THUMBNAIL_SOURCE, &_tmp13_, NULL, FALSE);
-#line 876 "/home/jens/Source/shotwell/src/Event.vala"
+#line 878 "/home/jens/Source/shotwell/src/Event.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self);
-#line 6767 "Event.c"
+#line 6769 "Event.c"
}
-#line 878 "/home/jens/Source/shotwell/src/Event.vala"
+#line 880 "/home/jens/Source/shotwell/src/Event.vala"
_tmp14_ = source;
-#line 878 "/home/jens/Source/shotwell/src/Event.vala"
+#line 880 "/home/jens/Source/shotwell/src/Event.vala"
_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 878 "/home/jens/Source/shotwell/src/Event.vala"
+#line 880 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (self->priv->primary_source);
-#line 878 "/home/jens/Source/shotwell/src/Event.vala"
+#line 880 "/home/jens/Source/shotwell/src/Event.vala"
self->priv->primary_source = _tmp15_;
-#line 879 "/home/jens/Source/shotwell/src/Event.vala"
+#line 881 "/home/jens/Source/shotwell/src/Event.vala"
_tmp16_ = self->priv->primary_source;
-#line 879 "/home/jens/Source/shotwell/src/Event.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), "thumbnail-altered", (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self, 0);
#line 881 "/home/jens/Source/shotwell/src/Event.vala"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), "thumbnail-altered", (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self, 0);
+#line 883 "/home/jens/Source/shotwell/src/Event.vala"
thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 6783 "Event.c"
+#line 6785 "Event.c"
}
-#line 884 "/home/jens/Source/shotwell/src/Event.vala"
+#line 886 "/home/jens/Source/shotwell/src/Event.vala"
result = committed;
-#line 884 "/home/jens/Source/shotwell/src/Event.vala"
+#line 886 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6789 "Event.c"
+#line 6791 "Event.c"
}
@@ -6794,27 +6796,27 @@ static void event_release_primary_source (Event* self) {
MediaSource* _tmp0_ = NULL;
MediaSource* _tmp1_ = NULL;
guint _tmp2_ = 0U;
-#line 887 "/home/jens/Source/shotwell/src/Event.vala"
+#line 889 "/home/jens/Source/shotwell/src/Event.vala"
g_return_if_fail (IS_EVENT (self));
-#line 888 "/home/jens/Source/shotwell/src/Event.vala"
+#line 890 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = self->priv->primary_source;
-#line 888 "/home/jens/Source/shotwell/src/Event.vala"
+#line 890 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp0_ == NULL) {
-#line 889 "/home/jens/Source/shotwell/src/Event.vala"
+#line 891 "/home/jens/Source/shotwell/src/Event.vala"
return;
-#line 6805 "Event.c"
+#line 6807 "Event.c"
}
-#line 891 "/home/jens/Source/shotwell/src/Event.vala"
+#line 893 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = self->priv->primary_source;
-#line 891 "/home/jens/Source/shotwell/src/Event.vala"
+#line 893 "/home/jens/Source/shotwell/src/Event.vala"
g_signal_parse_name ("thumbnail-altered", TYPE_THUMBNAIL_SOURCE, &_tmp2_, NULL, FALSE);
-#line 891 "/home/jens/Source/shotwell/src/Event.vala"
+#line 893 "/home/jens/Source/shotwell/src/Event.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self);
-#line 892 "/home/jens/Source/shotwell/src/Event.vala"
+#line 894 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (self->priv->primary_source);
-#line 892 "/home/jens/Source/shotwell/src/Event.vala"
+#line 894 "/home/jens/Source/shotwell/src/Event.vala"
self->priv->primary_source = NULL;
-#line 6817 "Event.c"
+#line 6819 "Event.c"
}
@@ -6824,59 +6826,59 @@ static GdkPixbuf* event_real_get_thumbnail (ThumbnailSource* base, gint scale, G
GdkPixbuf* _tmp0_ = NULL;
MediaSource* _tmp1_ = NULL;
GError * _inner_error_ = NULL;
-#line 895 "/home/jens/Source/shotwell/src/Event.vala"
+#line 897 "/home/jens/Source/shotwell/src/Event.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = self->priv->primary_source;
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp1_ != NULL) {
-#line 6833 "Event.c"
+#line 6835 "Event.c"
MediaSource* _tmp2_ = NULL;
gint _tmp3_ = 0;
GdkPixbuf* _tmp4_ = NULL;
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = self->priv->primary_source;
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = scale;
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp3_, &_inner_error_);
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp0_);
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = _tmp4_;
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
g_propagate_error (error, _inner_error_);
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp0_);
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
return NULL;
-#line 6855 "Event.c"
+#line 6857 "Event.c"
}
} else {
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp0_);
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = NULL;
-#line 6862 "Event.c"
+#line 6864 "Event.c"
}
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp0_;
-#line 896 "/home/jens/Source/shotwell/src/Event.vala"
+#line 898 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6868 "Event.c"
+#line 6870 "Event.c"
}
GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
GdkPixbuf* result = NULL;
GError * _inner_error_ = NULL;
-#line 899 "/home/jens/Source/shotwell/src/Event.vala"
+#line 901 "/home/jens/Source/shotwell/src/Event.vala"
g_return_val_if_fail (IS_EVENT (self), NULL);
-#line 899 "/home/jens/Source/shotwell/src/Event.vala"
+#line 901 "/home/jens/Source/shotwell/src/Event.vala"
g_return_val_if_fail (scaling != NULL, NULL);
-#line 6879 "Event.c"
+#line 6881 "Event.c"
{
GdkPixbuf* _tmp0_ = NULL;
MediaSource* _tmp1_ = NULL;
@@ -6885,61 +6887,61 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
GdkPixbuf* _tmp4_ = NULL;
GdkPixbuf* _tmp5_ = NULL;
GdkPixbuf* _tmp6_ = NULL;
-#line 901 "/home/jens/Source/shotwell/src/Event.vala"
+#line 903 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = event_get_primary_source (self);
-#line 901 "/home/jens/Source/shotwell/src/Event.vala"
+#line 903 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = _tmp1_;
-#line 901 "/home/jens/Source/shotwell/src/Event.vala"
+#line 903 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = *scaling;
-#line 901 "/home/jens/Source/shotwell/src/Event.vala"
+#line 903 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = media_source_get_preview_pixbuf (_tmp2_, &_tmp3_, &_inner_error_);
-#line 901 "/home/jens/Source/shotwell/src/Event.vala"
+#line 903 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = _tmp4_;
-#line 901 "/home/jens/Source/shotwell/src/Event.vala"
+#line 903 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp2_);
-#line 901 "/home/jens/Source/shotwell/src/Event.vala"
+#line 903 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = _tmp5_;
-#line 901 "/home/jens/Source/shotwell/src/Event.vala"
+#line 903 "/home/jens/Source/shotwell/src/Event.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6904 "Event.c"
+#line 6906 "Event.c"
goto __catch430_g_error;
}
-#line 901 "/home/jens/Source/shotwell/src/Event.vala"
+#line 903 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = _tmp0_;
-#line 901 "/home/jens/Source/shotwell/src/Event.vala"
+#line 903 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = NULL;
-#line 901 "/home/jens/Source/shotwell/src/Event.vala"
+#line 903 "/home/jens/Source/shotwell/src/Event.vala"
result = _tmp6_;
-#line 901 "/home/jens/Source/shotwell/src/Event.vala"
+#line 903 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_tmp0_);
-#line 901 "/home/jens/Source/shotwell/src/Event.vala"
+#line 903 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6917 "Event.c"
+#line 6919 "Event.c"
}
goto __finally430;
__catch430_g_error:
{
GError* err = NULL;
-#line 900 "/home/jens/Source/shotwell/src/Event.vala"
+#line 902 "/home/jens/Source/shotwell/src/Event.vala"
err = _inner_error_;
-#line 900 "/home/jens/Source/shotwell/src/Event.vala"
+#line 902 "/home/jens/Source/shotwell/src/Event.vala"
_inner_error_ = NULL;
-#line 903 "/home/jens/Source/shotwell/src/Event.vala"
+#line 905 "/home/jens/Source/shotwell/src/Event.vala"
result = NULL;
-#line 903 "/home/jens/Source/shotwell/src/Event.vala"
+#line 905 "/home/jens/Source/shotwell/src/Event.vala"
_g_error_free0 (err);
-#line 903 "/home/jens/Source/shotwell/src/Event.vala"
+#line 905 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 6933 "Event.c"
+#line 6935 "Event.c"
}
__finally430:
-#line 900 "/home/jens/Source/shotwell/src/Event.vala"
+#line 902 "/home/jens/Source/shotwell/src/Event.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 900 "/home/jens/Source/shotwell/src/Event.vala"
+#line 902 "/home/jens/Source/shotwell/src/Event.vala"
g_clear_error (&_inner_error_);
-#line 900 "/home/jens/Source/shotwell/src/Event.vala"
+#line 902 "/home/jens/Source/shotwell/src/Event.vala"
return NULL;
-#line 6942 "Event.c"
+#line 6944 "Event.c"
}
@@ -6953,36 +6955,36 @@ static void event_real_destroy (DataSource* base) {
VideoTable* _tmp8_ = NULL;
EventID _tmp9_ = {0};
GError * _inner_error_ = NULL;
-#line 907 "/home/jens/Source/shotwell/src/Event.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
#line 909 "/home/jens/Source/shotwell/src/Event.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT, Event);
+#line 911 "/home/jens/Source/shotwell/src/Event.vala"
_tmp0_ = self->priv->view;
-#line 909 "/home/jens/Source/shotwell/src/Event.vala"
+#line 911 "/home/jens/Source/shotwell/src/Event.vala"
view_collection_halt_all_monitoring (_tmp0_);
-#line 6962 "Event.c"
+#line 6964 "Event.c"
{
EventTable* _tmp1_ = NULL;
EventID _tmp2_ = {0};
-#line 913 "/home/jens/Source/shotwell/src/Event.vala"
+#line 915 "/home/jens/Source/shotwell/src/Event.vala"
_tmp1_ = event_event_table;
-#line 913 "/home/jens/Source/shotwell/src/Event.vala"
+#line 915 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = self->priv->event_id;
-#line 913 "/home/jens/Source/shotwell/src/Event.vala"
+#line 915 "/home/jens/Source/shotwell/src/Event.vala"
event_table_remove (_tmp1_, &_tmp2_, &_inner_error_);
-#line 913 "/home/jens/Source/shotwell/src/Event.vala"
+#line 915 "/home/jens/Source/shotwell/src/Event.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 913 "/home/jens/Source/shotwell/src/Event.vala"
+#line 915 "/home/jens/Source/shotwell/src/Event.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6976 "Event.c"
+#line 6978 "Event.c"
goto __catch431_database_error;
}
-#line 913 "/home/jens/Source/shotwell/src/Event.vala"
+#line 915 "/home/jens/Source/shotwell/src/Event.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 913 "/home/jens/Source/shotwell/src/Event.vala"
+#line 915 "/home/jens/Source/shotwell/src/Event.vala"
g_clear_error (&_inner_error_);
-#line 913 "/home/jens/Source/shotwell/src/Event.vala"
+#line 915 "/home/jens/Source/shotwell/src/Event.vala"
return;
-#line 6985 "Event.c"
+#line 6987 "Event.c"
}
}
goto __finally431;
@@ -6990,59 +6992,59 @@ static void event_real_destroy (DataSource* base) {
{
GError* err = NULL;
GError* _tmp3_ = NULL;
-#line 912 "/home/jens/Source/shotwell/src/Event.vala"
+#line 914 "/home/jens/Source/shotwell/src/Event.vala"
err = _inner_error_;
-#line 912 "/home/jens/Source/shotwell/src/Event.vala"
+#line 914 "/home/jens/Source/shotwell/src/Event.vala"
_inner_error_ = NULL;
-#line 915 "/home/jens/Source/shotwell/src/Event.vala"
+#line 917 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = err;
-#line 915 "/home/jens/Source/shotwell/src/Event.vala"
+#line 917 "/home/jens/Source/shotwell/src/Event.vala"
app_window_database_error (_tmp3_);
-#line 912 "/home/jens/Source/shotwell/src/Event.vala"
+#line 914 "/home/jens/Source/shotwell/src/Event.vala"
_g_error_free0 (err);
-#line 7003 "Event.c"
+#line 7005 "Event.c"
}
__finally431:
-#line 912 "/home/jens/Source/shotwell/src/Event.vala"
+#line 914 "/home/jens/Source/shotwell/src/Event.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 912 "/home/jens/Source/shotwell/src/Event.vala"
+#line 914 "/home/jens/Source/shotwell/src/Event.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 912 "/home/jens/Source/shotwell/src/Event.vala"
+#line 914 "/home/jens/Source/shotwell/src/Event.vala"
g_clear_error (&_inner_error_);
-#line 912 "/home/jens/Source/shotwell/src/Event.vala"
+#line 914 "/home/jens/Source/shotwell/src/Event.vala"
return;
-#line 7014 "Event.c"
+#line 7016 "Event.c"
}
-#line 919 "/home/jens/Source/shotwell/src/Event.vala"
+#line 921 "/home/jens/Source/shotwell/src/Event.vala"
_tmp4_ = photo_table_get_instance ();
-#line 919 "/home/jens/Source/shotwell/src/Event.vala"
+#line 921 "/home/jens/Source/shotwell/src/Event.vala"
_tmp5_ = _tmp4_;
-#line 919 "/home/jens/Source/shotwell/src/Event.vala"
+#line 921 "/home/jens/Source/shotwell/src/Event.vala"
_tmp6_ = self->priv->event_id;
-#line 919 "/home/jens/Source/shotwell/src/Event.vala"
+#line 921 "/home/jens/Source/shotwell/src/Event.vala"
photo_table_drop_event (_tmp5_, &_tmp6_);
-#line 919 "/home/jens/Source/shotwell/src/Event.vala"
+#line 921 "/home/jens/Source/shotwell/src/Event.vala"
_database_table_unref0 (_tmp5_);
-#line 920 "/home/jens/Source/shotwell/src/Event.vala"
+#line 922 "/home/jens/Source/shotwell/src/Event.vala"
_tmp7_ = video_table_get_instance ();
-#line 920 "/home/jens/Source/shotwell/src/Event.vala"
+#line 922 "/home/jens/Source/shotwell/src/Event.vala"
_tmp8_ = _tmp7_;
-#line 920 "/home/jens/Source/shotwell/src/Event.vala"
+#line 922 "/home/jens/Source/shotwell/src/Event.vala"
_tmp9_ = self->priv->event_id;
-#line 920 "/home/jens/Source/shotwell/src/Event.vala"
+#line 922 "/home/jens/Source/shotwell/src/Event.vala"
video_table_drop_event (_tmp8_, &_tmp9_);
-#line 920 "/home/jens/Source/shotwell/src/Event.vala"
- _database_table_unref0 (_tmp8_);
#line 922 "/home/jens/Source/shotwell/src/Event.vala"
+ _database_table_unref0 (_tmp8_);
+#line 924 "/home/jens/Source/shotwell/src/Event.vala"
DATA_SOURCE_CLASS (event_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENT_SOURCE, EventSource), TYPE_DATA_SOURCE, DataSource));
-#line 7038 "Event.c"
+#line 7040 "Event.c"
}
static void _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
#line 126 "/home/jens/Source/shotwell/src/Event.vala"
event_event_snapshot_on_attached_source_destroyed ((EventEventSnapshot*) self, source);
-#line 7045 "Event.c"
+#line 7047 "Event.c"
}
@@ -7085,7 +7087,7 @@ static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Ev
_g_object_unref0 (self->priv->primary_source);
#line 113 "/home/jens/Source/shotwell/src/Event.vala"
self->priv->primary_source = _tmp6_;
-#line 7088 "Event.c"
+#line 7090 "Event.c"
{
GeeIterator* _source_it = NULL;
Event* _tmp7_ = NULL;
@@ -7109,7 +7111,7 @@ static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Ev
_source_it = _tmp11_;
#line 118 "/home/jens/Source/shotwell/src/Event.vala"
while (TRUE) {
-#line 7112 "Event.c"
+#line 7114 "Event.c"
GeeIterator* _tmp12_ = NULL;
gboolean _tmp13_ = FALSE;
MediaSource* source = NULL;
@@ -7125,7 +7127,7 @@ static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Ev
if (!_tmp13_) {
#line 118 "/home/jens/Source/shotwell/src/Event.vala"
break;
-#line 7128 "Event.c"
+#line 7130 "Event.c"
}
#line 118 "/home/jens/Source/shotwell/src/Event.vala"
_tmp14_ = _source_it;
@@ -7141,11 +7143,11 @@ static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Ev
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
#line 118 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (source);
-#line 7144 "Event.c"
+#line 7146 "Event.c"
}
#line 118 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (_source_it);
-#line 7148 "Event.c"
+#line 7150 "Event.c"
}
#line 121 "/home/jens/Source/shotwell/src/Event.vala"
_tmp18_ = library_photo_global;
@@ -7157,21 +7159,21 @@ static EventEventSnapshot* event_event_snapshot_construct (GType object_type, Ev
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _event_event_snapshot_on_attached_source_destroyed_source_collection_item_destroyed, self);
#line 110 "/home/jens/Source/shotwell/src/Event.vala"
return self;
-#line 7160 "Event.c"
+#line 7162 "Event.c"
}
static EventEventSnapshot* event_event_snapshot_new (Event* event) {
#line 110 "/home/jens/Source/shotwell/src/Event.vala"
return event_event_snapshot_construct (EVENT_TYPE_EVENT_SNAPSHOT, event);
-#line 7167 "Event.c"
+#line 7169 "Event.c"
}
static gpointer _event_row_ref0 (gpointer self) {
#line 131 "/home/jens/Source/shotwell/src/Event.vala"
return self ? event_row_ref (self) : NULL;
-#line 7174 "Event.c"
+#line 7176 "Event.c"
}
@@ -7189,7 +7191,7 @@ static EventRow* event_event_snapshot_get_row (EventEventSnapshot* self) {
result = _tmp1_;
#line 131 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 7192 "Event.c"
+#line 7194 "Event.c"
}
@@ -7215,7 +7217,7 @@ static void event_event_snapshot_real_notify_broken (SourceSnapshot* base) {
gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 139 "/home/jens/Source/shotwell/src/Event.vala"
SOURCE_SNAPSHOT_CLASS (event_event_snapshot_parent_class)->notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot));
-#line 7218 "Event.c"
+#line 7220 "Event.c"
}
@@ -7239,7 +7241,7 @@ static void event_event_snapshot_on_attached_source_destroyed (EventEventSnapsho
_tmp3_ = media_source;
#line 146 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp3_ != NULL) {
-#line 7242 "Event.c"
+#line 7244 "Event.c"
MediaSource* _tmp4_ = NULL;
MediaSource* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
@@ -7251,17 +7253,17 @@ static void event_event_snapshot_on_attached_source_destroyed (EventEventSnapsho
_tmp6_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource));
#line 146 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = _tmp6_;
-#line 7254 "Event.c"
+#line 7256 "Event.c"
} else {
#line 146 "/home/jens/Source/shotwell/src/Event.vala"
_tmp2_ = FALSE;
-#line 7258 "Event.c"
+#line 7260 "Event.c"
}
#line 146 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp2_) {
#line 147 "/home/jens/Source/shotwell/src/Event.vala"
source_snapshot_notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot));
-#line 7264 "Event.c"
+#line 7266 "Event.c"
} else {
GeeArrayList* _tmp7_ = NULL;
MediaSource* _tmp8_ = NULL;
@@ -7276,12 +7278,12 @@ static void event_event_snapshot_on_attached_source_destroyed (EventEventSnapsho
if (_tmp9_) {
#line 149 "/home/jens/Source/shotwell/src/Event.vala"
source_snapshot_notify_broken (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_SNAPSHOT, SourceSnapshot));
-#line 7279 "Event.c"
+#line 7281 "Event.c"
}
}
#line 142 "/home/jens/Source/shotwell/src/Event.vala"
_g_object_unref0 (media_source);
-#line 7284 "Event.c"
+#line 7286 "Event.c"
}
@@ -7294,7 +7296,7 @@ static void event_event_snapshot_class_init (EventEventSnapshotClass * klass) {
g_type_class_add_private (klass, sizeof (EventEventSnapshotPrivate));
#line 105 "/home/jens/Source/shotwell/src/Event.vala"
((SourceSnapshotClass *) klass)->notify_broken = event_event_snapshot_real_notify_broken;
-#line 7297 "Event.c"
+#line 7299 "Event.c"
}
@@ -7306,7 +7308,7 @@ static void event_event_snapshot_instance_init (EventEventSnapshot * self) {
_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
#line 108 "/home/jens/Source/shotwell/src/Event.vala"
self->priv->attached_sources = _tmp0_;
-#line 7309 "Event.c"
+#line 7311 "Event.c"
}
@@ -7338,7 +7340,7 @@ static void event_event_snapshot_finalize (SourceSnapshot* obj) {
_g_object_unref0 (self->priv->attached_sources);
#line 105 "/home/jens/Source/shotwell/src/Event.vala"
SOURCE_SNAPSHOT_CLASS (event_event_snapshot_parent_class)->finalize (obj);
-#line 7341 "Event.c"
+#line 7343 "Event.c"
}
@@ -7365,21 +7367,21 @@ static EventEventProxy* event_event_proxy_construct (GType object_type, Event* e
self = (EventEventProxy*) source_proxy_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource));
#line 154 "/home/jens/Source/shotwell/src/Event.vala"
return self;
-#line 7368 "Event.c"
+#line 7370 "Event.c"
}
static EventEventProxy* event_event_proxy_new (Event* event) {
#line 154 "/home/jens/Source/shotwell/src/Event.vala"
return event_event_proxy_construct (EVENT_TYPE_EVENT_PROXY, event);
-#line 7375 "Event.c"
+#line 7377 "Event.c"
}
static gpointer _source_snapshot_ref0 (gpointer self) {
#line 159 "/home/jens/Source/shotwell/src/Event.vala"
return self ? source_snapshot_ref (self) : NULL;
-#line 7382 "Event.c"
+#line 7384 "Event.c"
}
@@ -7424,7 +7426,7 @@ static DataSource* event_event_proxy_real_reconstitute (SourceProxy* base, gint6
_source_snapshot_unref0 (event_snapshot);
#line 162 "/home/jens/Source/shotwell/src/Event.vala"
return result;
-#line 7427 "Event.c"
+#line 7429 "Event.c"
}
@@ -7433,7 +7435,7 @@ static void event_event_proxy_class_init (EventEventProxyClass * klass) {
event_event_proxy_parent_class = g_type_class_peek_parent (klass);
#line 153 "/home/jens/Source/shotwell/src/Event.vala"
((SourceProxyClass *) klass)->reconstitute = event_event_proxy_real_reconstitute;
-#line 7436 "Event.c"
+#line 7438 "Event.c"
}
@@ -7498,7 +7500,7 @@ static void event_class_init (EventClass * klass) {
((DataSourceClass *) klass)->destroy = event_real_destroy;
#line 94 "/home/jens/Source/shotwell/src/Event.vala"
G_OBJECT_CLASS (klass)->finalize = event_finalize;
-#line 7501 "Event.c"
+#line 7503 "Event.c"
}
@@ -7517,7 +7519,7 @@ static void event_container_source_interface_init (ContainerSourceIface * iface)
iface->establish_link = (void (*)(ContainerSource*, DataSource*)) event_real_establish_link;
#line 94 "/home/jens/Source/shotwell/src/Event.vala"
iface->establish_link_many = (void (*)(ContainerSource*, GeeCollection*)) event_real_establish_link_many;
-#line 7520 "Event.c"
+#line 7522 "Event.c"
}
@@ -7526,7 +7528,7 @@ static void event_proxyable_interface_init (ProxyableIface * iface) {
event_proxyable_parent_iface = g_type_interface_peek_parent (iface);
#line 94 "/home/jens/Source/shotwell/src/Event.vala"
iface->get_proxy = (SourceProxy* (*)(Proxyable*)) event_real_get_proxy;
-#line 7529 "Event.c"
+#line 7531 "Event.c"
}
@@ -7535,7 +7537,7 @@ static void event_indexable_interface_init (IndexableIface * iface) {
event_indexable_parent_iface = g_type_interface_peek_parent (iface);
#line 94 "/home/jens/Source/shotwell/src/Event.vala"
iface->get_indexable_keywords = (const gchar* (*)(Indexable*)) event_real_get_indexable_keywords;
-#line 7538 "Event.c"
+#line 7540 "Event.c"
}
@@ -7550,7 +7552,7 @@ static void event_instance_init (Event * self) {
self->priv->indexable_keywords = NULL;
#line 178 "/home/jens/Source/shotwell/src/Event.vala"
self->priv->comment = NULL;
-#line 7553 "Event.c"
+#line 7555 "Event.c"
}
@@ -7573,7 +7575,7 @@ static void event_finalize (GObject* obj) {
_tmp0_ = self->priv->primary_source;
#line 237 "/home/jens/Source/shotwell/src/Event.vala"
if (_tmp0_ != NULL) {
-#line 7576 "Event.c"
+#line 7578 "Event.c"
MediaSource* _tmp1_ = NULL;
guint _tmp2_ = 0U;
#line 238 "/home/jens/Source/shotwell/src/Event.vala"
@@ -7582,7 +7584,7 @@ static void event_finalize (GObject* obj) {
g_signal_parse_name ("thumbnail-altered", TYPE_THUMBNAIL_SOURCE, &_tmp2_, NULL, FALSE);
#line 238 "/home/jens/Source/shotwell/src/Event.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _event_on_primary_thumbnail_altered_thumbnail_source_thumbnail_altered, self);
-#line 7585 "Event.c"
+#line 7587 "Event.c"
}
#line 240 "/home/jens/Source/shotwell/src/Event.vala"
_tmp3_ = self->priv->view;
@@ -7626,7 +7628,7 @@ static void event_finalize (GObject* obj) {
_g_free0 (self->priv->comment);
#line 94 "/home/jens/Source/shotwell/src/Event.vala"
G_OBJECT_CLASS (event_parent_class)->finalize (obj);
-#line 7629 "Event.c"
+#line 7631 "Event.c"
}
diff --git a/src/Event.vala b/src/Event.vala
index 3518cab..084df97 100644
--- a/src/Event.vala
+++ b/src/Event.vala
@@ -617,8 +617,10 @@ public class Event : EventSource, ContainerSource, Proxyable, Indexable {
// if the earliest's exposure time was on the day but *before* the boundary hour,
// step it back a day to the prior day's boundary
- if (earliest_tm.hour < EVENT_BOUNDARY_HOUR)
+ if (earliest_tm.hour < EVENT_BOUNDARY_HOUR) {
+ debug("Hour before boundary, shifting back one day");
start_boundary -= TIME_T_DAY;
+ }
time_t end_boundary = (start_boundary + TIME_T_DAY - 1);
diff --git a/src/Exporter.c b/src/Exporter.c
index 1368956..a120c56 100644
--- a/src/Exporter.c
+++ b/src/Exporter.c
@@ -1,4 +1,4 @@
-/* Exporter.c generated by valac 0.32.1, the Vala compiler
+/* Exporter.c generated by valac 0.34.1, the Vala compiler
* generated from Exporter.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/International.c b/src/International.c
index db54c27..eb03bb2 100644
--- a/src/International.c
+++ b/src/International.c
@@ -1,4 +1,4 @@
-/* International.c generated by valac 0.32.1, the Vala compiler
+/* International.c generated by valac 0.34.1, the Vala compiler
* generated from International.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/LibraryFiles.c b/src/LibraryFiles.c
index b0fa855..9139935 100644
--- a/src/LibraryFiles.c
+++ b/src/LibraryFiles.c
@@ -1,4 +1,4 @@
-/* LibraryFiles.c generated by valac 0.32.1, the Vala compiler
+/* LibraryFiles.c generated by valac 0.34.1, the Vala compiler
* generated from LibraryFiles.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c
index d7cdd2e..6253bd5 100644
--- a/src/LibraryMonitor.c
+++ b/src/LibraryMonitor.c
@@ -1,4 +1,4 @@
-/* LibraryMonitor.c generated by valac 0.32.1, the Vala compiler
+/* LibraryMonitor.c generated by valac 0.34.1, the Vala compiler
* generated from LibraryMonitor.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c
index 24f4ef7..f539c7c 100644
--- a/src/MediaDataRepresentation.c
+++ b/src/MediaDataRepresentation.c
@@ -1,4 +1,4 @@
-/* MediaDataRepresentation.c generated by valac 0.32.1, the Vala compiler
+/* MediaDataRepresentation.c generated by valac 0.34.1, the Vala compiler
* generated from MediaDataRepresentation.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -4332,11 +4332,11 @@ void media_source_collection_count_media (GeeCollection* media, gint* photo_coun
#line 401 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
g_return_if_fail (GEE_IS_COLLECTION (media));
#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
- _tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
#line 403 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
photos = _tmp0_;
#line 404 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
- _tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp1_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
#line 404 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
videos = _tmp1_;
#line 406 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
diff --git a/src/MediaDataRepresentation.vala b/src/MediaDataRepresentation.vala
index f01f147..484404c 100644
--- a/src/MediaDataRepresentation.vala
+++ b/src/MediaDataRepresentation.vala
@@ -400,8 +400,8 @@ public abstract class MediaSourceCollection : DatabaseSourceCollection {
public static void count_media(Gee.Collection<MediaSource> media, out int photo_count,
out int video_count) {
- Gee.ArrayList<MediaSource> photos = new Gee.ArrayList<MediaSource>();
- Gee.ArrayList<MediaSource> videos = new Gee.ArrayList<MediaSource>();
+ var photos = new Gee.ArrayList<LibraryPhoto>();
+ var videos = new Gee.ArrayList<Video>();
filter_media(media, photos, videos);
diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c
index 68c9735..0331fd7 100644
--- a/src/MediaInterfaces.c
+++ b/src/MediaInterfaces.c
@@ -1,4 +1,4 @@
-/* MediaInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* MediaInterfaces.c generated by valac 0.34.1, the Vala compiler
* generated from MediaInterfaces.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/MediaMetadata.c b/src/MediaMetadata.c
index b426c62..8f81cf6 100644
--- a/src/MediaMetadata.c
+++ b/src/MediaMetadata.c
@@ -1,4 +1,4 @@
-/* MediaMetadata.c generated by valac 0.32.1, the Vala compiler
+/* MediaMetadata.c generated by valac 0.34.1, the Vala compiler
* generated from MediaMetadata.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1093,13 +1093,13 @@ gboolean metadata_date_time_from_exif_date_time (const gchar* date_time, time_t*
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return;
#line 1105 "MediaMetadata.c"
}
@@ -1117,35 +1117,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* _tmp3_ = NULL;
gint _tmp3__length1 = 0;
gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1151 "MediaMetadata.c"
}
diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c
index 0a2b28d..3072ab4 100644
--- a/src/MediaMonitor.c
+++ b/src/MediaMonitor.c
@@ -1,4 +1,4 @@
-/* MediaMonitor.c generated by valac 0.32.1, the Vala compiler
+/* MediaMonitor.c generated by valac 0.34.1, the Vala compiler
* generated from MediaMonitor.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2295,7 +2295,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
#line 318 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp41_ = _tmp40_->monitorable;
#line 318 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_SOURCE, MediaSource));
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp41_);
#line 319 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp42_ = updates;
#line 319 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
@@ -2340,7 +2340,7 @@ static void media_monitor_real_process_updates (MediaMonitor* self, GeeCollectio
#line 327 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp50_ = _tmp49_->monitorable;
#line 327 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_MEDIA_SOURCE, MediaSource));
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp50_);
#line 328 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
_tmp51_ = updates;
#line 328 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
diff --git a/src/MediaMonitor.vala b/src/MediaMonitor.vala
index 3859b97..a36f689 100644
--- a/src/MediaMonitor.vala
+++ b/src/MediaMonitor.vala
@@ -286,8 +286,8 @@ public abstract class MediaMonitor : Object {
TransactionController controller, ref int op_count) throws Error {
Gee.Map<Monitorable, File> set_master_file = null;
Gee.Map<Monitorable, FileInfo> set_master_file_info = null;
- Gee.ArrayList<MediaSource> to_offline = null;
- Gee.ArrayList<MediaSource> to_online = null;
+ Gee.ArrayList<Monitorable> to_offline = null;
+ Gee.ArrayList<Monitorable> to_online = null;
foreach (MonitorableUpdates updates in all_updates) {
if (op_count >= MAX_OPERATIONS_PER_CYCLE)
diff --git a/src/MediaPage.c b/src/MediaPage.c
index 57e1c1f..79c8125 100644
--- a/src/MediaPage.c
+++ b/src/MediaPage.c
@@ -1,4 +1,4 @@
-/* MediaPage.c generated by valac 0.32.1, the Vala compiler
+/* MediaPage.c generated by valac 0.34.1, the Vala compiler
* generated from MediaPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/MediaViewTracker.c b/src/MediaViewTracker.c
index 3187c83..cdb92b8 100644
--- a/src/MediaViewTracker.c
+++ b/src/MediaViewTracker.c
@@ -1,4 +1,4 @@
-/* MediaViewTracker.c generated by valac 0.32.1, the Vala compiler
+/* MediaViewTracker.c generated by valac 0.34.1, the Vala compiler
* generated from MediaViewTracker.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c
index ec51b73..f8990df 100644
--- a/src/MetadataWriter.c
+++ b/src/MetadataWriter.c
@@ -1,4 +1,4 @@
-/* MetadataWriter.c generated by valac 0.32.1, the Vala compiler
+/* MetadataWriter.c generated by valac 0.34.1, the Vala compiler
* generated from MetadataWriter.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/NaturalCollate.c b/src/NaturalCollate.c
index 35b129c..d2c467f 100644
--- a/src/NaturalCollate.c
+++ b/src/NaturalCollate.c
@@ -1,4 +1,4 @@
-/* NaturalCollate.c generated by valac 0.32.1, the Vala compiler
+/* NaturalCollate.c generated by valac 0.34.1, the Vala compiler
* generated from NaturalCollate.vala, do not modify */
@@ -27,15 +27,15 @@ static gunichar string_get_char (const gchar* self, glong index) {
gunichar result = 0U;
glong _tmp0_ = 0L;
gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 41 "NaturalCollate.c"
}
@@ -45,15 +45,15 @@ static gint string_index_of_nth_char (const gchar* self, glong c) {
gint result = 0;
glong _tmp0_ = 0L;
gchar* _tmp1_ = NULL;
-#line 1136 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1136 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1137 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = c;
-#line 1137 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_utf8_offset_to_pointer (self, _tmp0_);
-#line 1137 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (gint) (_tmp1_ - ((gchar*) self));
-#line 1137 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1137 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 59 "NaturalCollate.c"
}
@@ -66,37 +66,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 82 "NaturalCollate.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 90 "NaturalCollate.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 102 "NaturalCollate.c"
}
@@ -116,112 +116,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 126 "NaturalCollate.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 132 "NaturalCollate.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 136 "NaturalCollate.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 140 "NaturalCollate.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 152 "NaturalCollate.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 162 "NaturalCollate.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 168 "NaturalCollate.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 182 "NaturalCollate.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 192 "NaturalCollate.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 198 "NaturalCollate.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 207 "NaturalCollate.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 227 "NaturalCollate.c"
}
@@ -389,17 +389,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 405 "NaturalCollate.c"
}
@@ -410,17 +410,17 @@ static gchar* g_unichar_to_string (gunichar self) {
gchar* str = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 941 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 941 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 7);
-#line 941 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 941 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
str = (gchar*) _tmp0_;
-#line 942 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 942 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = str;
-#line 942 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 942 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_unichar_to_utf8 (self, _tmp1_);
-#line 943 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 943 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = str;
-#line 943 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 943 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 426 "NaturalCollate.c"
}
diff --git a/src/Orientation.c b/src/Orientation.c
index 3e2da2a..06baf5e 100644
--- a/src/Orientation.c
+++ b/src/Orientation.c
@@ -1,4 +1,4 @@
-/* Orientation.c generated by valac 0.32.1, the Vala compiler
+/* Orientation.c generated by valac 0.34.1, the Vala compiler
* generated from Orientation.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Page.c b/src/Page.c
index 81312ba..622f3ce 100644
--- a/src/Page.c
+++ b/src/Page.c
@@ -1,4 +1,4 @@
-/* Page.c generated by valac 0.32.1, the Vala compiler
+/* Page.c generated by valac 0.34.1, the Vala compiler
* generated from Page.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Photo.c b/src/Photo.c
index d0e4daa..2a8c634 100644
--- a/src/Photo.c
+++ b/src/Photo.c
@@ -1,4 +1,4 @@
-/* Photo.c generated by valac 0.32.1, the Vala compiler
+/* Photo.c generated by valac 0.34.1, the Vala compiler
* generated from Photo.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -36918,37 +36918,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 36929 "Photo.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 36937 "Photo.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 36949 "Photo.c"
}
@@ -36968,112 +36968,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 36973 "Photo.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 36979 "Photo.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 36983 "Photo.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 36987 "Photo.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 36999 "Photo.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 37009 "Photo.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 37015 "Photo.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 37029 "Photo.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 37039 "Photo.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 37045 "Photo.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 37054 "Photo.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 37074 "Photo.c"
}
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c
index c8e08e9..923a311 100644
--- a/src/PhotoMonitor.c
+++ b/src/PhotoMonitor.c
@@ -1,4 +1,4 @@
-/* PhotoMonitor.c generated by valac 0.32.1, the Vala compiler
+/* PhotoMonitor.c generated by valac 0.34.1, the Vala compiler
* generated from PhotoMonitor.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/PhotoPage.c b/src/PhotoPage.c
index ceeb0ec..c2639d4 100644
--- a/src/PhotoPage.c
+++ b/src/PhotoPage.c
@@ -1,4 +1,4 @@
-/* PhotoPage.c generated by valac 0.32.1, the Vala compiler
+/* PhotoPage.c generated by valac 0.34.1, the Vala compiler
* generated from PhotoPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -20434,7 +20434,7 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
FlagUnflagCommand* _tmp11_ = NULL;
FlagUnflagCommand* _tmp12_ = NULL;
#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- _tmp1_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+ _tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
photo_list = _tmp1_;
#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -20444,7 +20444,7 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_tmp4_ = _tmp3_;
#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
- gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource));
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
_g_object_unref0 (_tmp4_);
#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index ce57c2f..0e14aab 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -3125,7 +3125,7 @@ public class LibraryPhotoPage : EditingHostPage {
private void on_flag_unflag() {
if (has_photo()) {
- Gee.ArrayList<DataSource> photo_list = new Gee.ArrayList<DataSource>();
+ var photo_list = new Gee.ArrayList<MediaSource>();
photo_list.add(get_photo());
get_command_manager().execute(new FlagUnflagCommand(photo_list,
!((LibraryPhoto) get_photo()).is_flagged()));
diff --git a/src/PixbufCache.c b/src/PixbufCache.c
index 6a4add5..2b5d14c 100644
--- a/src/PixbufCache.c
+++ b/src/PixbufCache.c
@@ -1,4 +1,4 @@
-/* PixbufCache.c generated by valac 0.32.1, the Vala compiler
+/* PixbufCache.c generated by valac 0.34.1, the Vala compiler
* generated from PixbufCache.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Printing.c b/src/Printing.c
index 3a3da76..3f2eda2 100644
--- a/src/Printing.c
+++ b/src/Printing.c
@@ -1,4 +1,4 @@
-/* Printing.c generated by valac 0.32.1, the Vala compiler
+/* Printing.c generated by valac 0.34.1, the Vala compiler
* generated from Printing.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2944,15 +2944,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2958 "Printing.c"
}
@@ -3433,15 +3433,15 @@ static gdouble double_parse (const gchar* str) {
gdouble result = 0.0;
const gchar* _tmp0_ = NULL;
gdouble _tmp1_ = 0.0;
-#line 869 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 869 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (str != NULL, 0.0);
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_ascii_strtod (_tmp0_, NULL);
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3447 "Printing.c"
}
@@ -3503,17 +3503,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3519 "Printing.c"
}
diff --git a/src/Properties.c b/src/Properties.c
index 77f8271..cf4eb43 100644
--- a/src/Properties.c
+++ b/src/Properties.c
@@ -1,4 +1,4 @@
-/* Properties.c generated by valac 0.32.1, the Vala compiler
+/* Properties.c generated by valac 0.34.1, the Vala compiler
* generated from Properties.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1000,35 +1000,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* _tmp3_ = NULL;
gint _tmp3__length1 = 0;
gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1034 "Properties.c"
}
@@ -1038,15 +1038,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1052 "Properties.c"
}
@@ -1059,37 +1059,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 1075 "Properties.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1083 "Properties.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1095 "Properties.c"
}
@@ -1109,112 +1109,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 1119 "Properties.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 1125 "Properties.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 1129 "Properties.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 1133 "Properties.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 1145 "Properties.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 1155 "Properties.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 1161 "Properties.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 1175 "Properties.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 1185 "Properties.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 1191 "Properties.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 1200 "Properties.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1220 "Properties.c"
}
@@ -1327,13 +1327,13 @@ gchar* properties_get_prettyprint_time_with_seconds (Properties* self, struct tm
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return;
#line 1339 "Properties.c"
}
@@ -4761,11 +4761,11 @@ static void extended_properties_window_extended_properties_real_get_single_prope
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
#line 4771 "Properties.c"
{
@@ -4780,73 +4780,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 4802 "Properties.c"
goto __catch423_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 4811 "Properties.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 4827 "Properties.c"
goto __catch423_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 4838 "Properties.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 4852 "Properties.c"
}
@@ -4854,24 +4854,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
__catch423_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
#line 4866 "Properties.c"
}
__finally423:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 4877 "Properties.c"
}
diff --git a/src/Resources.c b/src/Resources.c
index 62a6c92..0143e70 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -1,4 +1,4 @@
-/* Resources.c generated by valac 0.32.1, the Vala compiler
+/* Resources.c generated by valac 0.34.1, the Vala compiler
* generated from Resources.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -481,10 +481,7 @@ void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error);
gchar* resources_to_css_color (GdkRGBA* color);
#define RESOURCES_ALL_DATA -1
void resources_style_widget (GtkWidget* widget, const gchar* stylesheet);
-#define RESOURCES_CUSTOM_CSS "LibraryWindow * {\n" \
-" -GtkPaned-handle-size: 1;\n" \
-" }\n" \
-" LibraryWindow .pane-separator {\n" \
+#define RESOURCES_CUSTOM_CSS "LibraryWindow .pane-separator {\n" \
" background-color: @borders;\n" \
" }\n" \
" SearchFilterToolbar {\n" \
diff --git a/src/Resources.vala b/src/Resources.vala
index cceb82b..39f587b 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -1089,10 +1089,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
}
public const string CUSTOM_CSS =
- """LibraryWindow * {
- -GtkPaned-handle-size: 1;
- }
- LibraryWindow .pane-separator {
+ """LibraryWindow .pane-separator {
background-color: @borders;
}
SearchFilterToolbar {
diff --git a/src/Screensaver.c b/src/Screensaver.c
index 50ae28a..44dd0b8 100644
--- a/src/Screensaver.c
+++ b/src/Screensaver.c
@@ -1,4 +1,4 @@
-/* Screensaver.c generated by valac 0.32.1, the Vala compiler
+/* Screensaver.c generated by valac 0.34.1, the Vala compiler
* generated from Screensaver.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/SearchFilter.c b/src/SearchFilter.c
index 4a48100..7204a17 100644
--- a/src/SearchFilter.c
+++ b/src/SearchFilter.c
@@ -1,4 +1,4 @@
-/* SearchFilter.c generated by valac 0.32.1, the Vala compiler
+/* SearchFilter.c generated by valac 0.34.1, the Vala compiler
* generated from SearchFilter.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2291,17 +2291,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2307 "SearchFilter.c"
}
diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c
index ea313b0..0b471d6 100644
--- a/src/SlideshowPage.c
+++ b/src/SlideshowPage.c
@@ -1,4 +1,4 @@
-/* SlideshowPage.c generated by valac 0.32.1, the Vala compiler
+/* SlideshowPage.c generated by valac 0.34.1, the Vala compiler
* generated from SlideshowPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/SortedList.c b/src/SortedList.c
index 85f22a9..3ba78e5 100644
--- a/src/SortedList.c
+++ b/src/SortedList.c
@@ -1,4 +1,4 @@
-/* SortedList.c generated by valac 0.32.1, the Vala compiler
+/* SortedList.c generated by valac 0.34.1, the Vala compiler
* generated from SortedList.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Tag.c b/src/Tag.c
index 3682fd8..ecb8dfb 100644
--- a/src/Tag.c
+++ b/src/Tag.c
@@ -1,4 +1,4 @@
-/* Tag.c generated by valac 0.32.1, the Vala compiler
+/* Tag.c generated by valac 0.34.1, the Vala compiler
* generated from Tag.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8022,35 +8022,35 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
const gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 8042 "Tag.c"
gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 8050 "Tag.c"
} else {
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = -1;
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 8056 "Tag.c"
}
@@ -8064,37 +8064,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 8080 "Tag.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 8088 "Tag.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 8100 "Tag.c"
}
@@ -8114,112 +8114,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 8124 "Tag.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 8130 "Tag.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 8134 "Tag.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 8138 "Tag.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 8150 "Tag.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 8160 "Tag.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 8166 "Tag.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 8180 "Tag.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 8190 "Tag.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 8196 "Tag.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 8205 "Tag.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 8225 "Tag.c"
}
diff --git a/src/Tag.vala b/src/Tag.vala
index 31b1e40..46cbfaa 100644
--- a/src/Tag.vala
+++ b/src/Tag.vala
@@ -205,7 +205,7 @@ public class TagSourceCollection : ContainerSourceCollection {
}
protected override void notify_container_contents_added(ContainerSource container,
- Gee.Collection<DataSource> added, bool relinking) {
+ Gee.Collection<DataObject> added, bool relinking) {
Tag tag = (Tag) container;
Gee.Collection<MediaSource> sources = (Gee.Collection<MediaSource>) added;
@@ -233,7 +233,7 @@ public class TagSourceCollection : ContainerSourceCollection {
}
protected override void notify_container_contents_removed(ContainerSource container,
- Gee.Collection<DataSource> removed, bool unlinking) {
+ Gee.Collection<DataObject> removed, bool unlinking) {
Tag tag = (Tag) container;
Gee.Collection<MediaSource> sources = (Gee.Collection<MediaSource>) removed;
diff --git a/src/Thumbnail.c b/src/Thumbnail.c
index 062529f..78270ae 100644
--- a/src/Thumbnail.c
+++ b/src/Thumbnail.c
@@ -1,4 +1,4 @@
-/* Thumbnail.c generated by valac 0.32.1, the Vala compiler
+/* Thumbnail.c generated by valac 0.34.1, the Vala compiler
* generated from Thumbnail.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/ThumbnailCache.c b/src/ThumbnailCache.c
index 225b52d..a68977d 100644
--- a/src/ThumbnailCache.c
+++ b/src/ThumbnailCache.c
@@ -1,4 +1,4 @@
-/* ThumbnailCache.c generated by valac 0.32.1, the Vala compiler
+/* ThumbnailCache.c generated by valac 0.34.1, the Vala compiler
* generated from ThumbnailCache.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/TimedQueue.c b/src/TimedQueue.c
index 9d872a5..73458a7 100644
--- a/src/TimedQueue.c
+++ b/src/TimedQueue.c
@@ -1,4 +1,4 @@
-/* TimedQueue.c generated by valac 0.32.1, the Vala compiler
+/* TimedQueue.c generated by valac 0.34.1, the Vala compiler
* generated from TimedQueue.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Tombstone.c b/src/Tombstone.c
index 7edac33..f72cc11 100644
--- a/src/Tombstone.c
+++ b/src/Tombstone.c
@@ -1,4 +1,4 @@
-/* Tombstone.c generated by valac 0.32.1, the Vala compiler
+/* Tombstone.c generated by valac 0.34.1, the Vala compiler
* generated from Tombstone.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/UnityProgressBar.c b/src/UnityProgressBar.c
index c32a00a..4f78059 100644
--- a/src/UnityProgressBar.c
+++ b/src/UnityProgressBar.c
@@ -1,4 +1,4 @@
-/* UnityProgressBar.c generated by valac 0.32.1, the Vala compiler
+/* UnityProgressBar.c generated by valac 0.34.1, the Vala compiler
* generated from UnityProgressBar.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/Upgrades.c b/src/Upgrades.c
index 4571390..420cc7c 100644
--- a/src/Upgrades.c
+++ b/src/Upgrades.c
@@ -1,4 +1,4 @@
-/* Upgrades.c generated by valac 0.32.1, the Vala compiler
+/* Upgrades.c generated by valac 0.34.1, the Vala compiler
* generated from Upgrades.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/VideoMetadata.c b/src/VideoMetadata.c
index 11c3258..15409fe 100644
--- a/src/VideoMetadata.c
+++ b/src/VideoMetadata.c
@@ -1,4 +1,4 @@
-/* VideoMetadata.c generated by valac 0.32.1, the Vala compiler
+/* VideoMetadata.c generated by valac 0.34.1, the Vala compiler
* generated from VideoMetadata.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1631,7 +1631,7 @@ void quick_time_atom_open_file (QuickTimeAtom* self, GError** error) {
#line 1631 "VideoMetadata.c"
}
#line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- _tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
+ _tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
#line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_g_object_unref0 (self->priv->input);
#line 192 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1670,7 +1670,7 @@ void quick_time_atom_close_file (QuickTimeAtom* self, GError** error) {
#line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp1_ = self->priv->input;
#line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+ g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
#line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 201 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1836,15 +1836,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1849 "VideoMetadata.c"
}
@@ -2142,7 +2142,7 @@ static void quick_time_atom_skip (QuickTimeAtom* self, guint64 skip_amount, GErr
#line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp1_ = skip_amount;
#line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream), _tmp1_, &_inner_error_);
+ skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream), _tmp1_, &_inner_error_);
#line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 268 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2951,37 +2951,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 2966 "VideoMetadata.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2974 "VideoMetadata.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2986 "VideoMetadata.c"
}
@@ -3001,112 +3001,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 3010 "VideoMetadata.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 3016 "VideoMetadata.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 3020 "VideoMetadata.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 3024 "VideoMetadata.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 3036 "VideoMetadata.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 3046 "VideoMetadata.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 3052 "VideoMetadata.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 3066 "VideoMetadata.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 3076 "VideoMetadata.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 3082 "VideoMetadata.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 3091 "VideoMetadata.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3111 "VideoMetadata.c"
}
@@ -4023,19 +4023,19 @@ static gchar* string_strip (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 4040 "VideoMetadata.c"
}
@@ -4575,7 +4575,7 @@ void avi_chunk_open_file (AVIChunk* self, GError** error) {
#line 4575 "VideoMetadata.c"
}
#line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- _tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
+ _tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
#line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_g_object_unref0 (self->priv->input);
#line 554 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4614,7 +4614,7 @@ void avi_chunk_close_file (AVIChunk* self, GError** error) {
#line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp1_ = self->priv->input;
#line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+ g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
#line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 563 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4643,7 +4643,7 @@ void avi_chunk_nonsection_skip (AVIChunk* self, guint64 skip_amount, GError** er
#line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp1_ = skip_amount;
#line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream), _tmp1_, &_inner_error_);
+ skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream), _tmp1_, &_inner_error_);
#line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 569 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4671,7 +4671,7 @@ void avi_chunk_skip (AVIChunk* self, guint64 skip_amount, GError** error) {
#line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
_tmp2_ = skip_amount;
#line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
- skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_INPUT_STREAM, GInputStream), _tmp2_, &_inner_error_);
+ skip_uint64 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_input_stream_get_type (), GInputStream), _tmp2_, &_inner_error_);
#line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 574 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
diff --git a/src/VideoMonitor.c b/src/VideoMonitor.c
index b3e9adb..4e1cd61 100644
--- a/src/VideoMonitor.c
+++ b/src/VideoMonitor.c
@@ -1,4 +1,4 @@
-/* VideoMonitor.c generated by valac 0.32.1, the Vala compiler
+/* VideoMonitor.c generated by valac 0.34.1, the Vala compiler
* generated from VideoMonitor.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/VideoSupport.c b/src/VideoSupport.c
index 989976f..aad43f3 100644
--- a/src/VideoSupport.c
+++ b/src/VideoSupport.c
@@ -1,4 +1,4 @@
-/* VideoSupport.c generated by valac 0.32.1, the Vala compiler
+/* VideoSupport.c generated by valac 0.34.1, the Vala compiler
* generated from VideoSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1921,103 +1921,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
glong _tmp19_ = 0L;
glong _tmp20_ = 0L;
gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp2_ < ((glong) 0)) {
#line 1937 "VideoSupport.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
start = _tmp3_ + _tmp4_;
#line 1946 "VideoSupport.c"
}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp5_ < ((glong) 0)) {
#line 1952 "VideoSupport.c"
glong _tmp6_ = 0L;
glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp6_ + _tmp7_;
#line 1961 "VideoSupport.c"
}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp9_ >= ((glong) 0)) {
#line 1967 "VideoSupport.c"
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = _tmp10_ <= _tmp11_;
#line 1976 "VideoSupport.c"
} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = FALSE;
#line 1980 "VideoSupport.c"
}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp13_ >= ((glong) 0)) {
#line 1988 "VideoSupport.c"
glong _tmp14_ = 0L;
glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ <= _tmp15_;
#line 1997 "VideoSupport.c"
} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
#line 2001 "VideoSupport.c"
}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2023 "VideoSupport.c"
}
@@ -3492,7 +3492,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
_tmp22_ = unix_input;
#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
- _tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+ _tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
_tmp21_ = _tmp23_;
#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
diff --git a/src/camera/Branch.c b/src/camera/Branch.c
index 7f2836e..52c3e93 100644
--- a/src/camera/Branch.c
+++ b/src/camera/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.1, the Vala compiler
* generated from Branch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/camera/Camera.c b/src/camera/Camera.c
index 71768fa..1f64b12 100644
--- a/src/camera/Camera.c
+++ b/src/camera/Camera.c
@@ -1,4 +1,4 @@
-/* Camera.c generated by valac 0.32.1, the Vala compiler
+/* Camera.c generated by valac 0.34.1, the Vala compiler
* generated from Camera.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index f758943..3ed9f58 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -1,4 +1,4 @@
-/* CameraTable.c generated by valac 0.32.1, the Vala compiler
+/* CameraTable.c generated by valac 0.34.1, the Vala compiler
* generated from CameraTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1545,37 +1545,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 1559 "CameraTable.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1567 "CameraTable.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1579 "CameraTable.c"
}
@@ -1595,112 +1595,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 1603 "CameraTable.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 1609 "CameraTable.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 1613 "CameraTable.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 1617 "CameraTable.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 1629 "CameraTable.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 1639 "CameraTable.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 1645 "CameraTable.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 1659 "CameraTable.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 1669 "CameraTable.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 1675 "CameraTable.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 1684 "CameraTable.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1704 "CameraTable.c"
}
@@ -1709,11 +1709,11 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
#line 1717 "CameraTable.c"
{
@@ -1728,73 +1728,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 1748 "CameraTable.c"
goto __catch56_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 1757 "CameraTable.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 1773 "CameraTable.c"
goto __catch56_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 1784 "CameraTable.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1798 "CameraTable.c"
}
@@ -1802,24 +1802,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
__catch56_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
#line 1812 "CameraTable.c"
}
__finally56:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 1823 "CameraTable.c"
}
diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c
index a703945..38c3a97 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -1,4 +1,4 @@
-/* GPhoto.c generated by valac 0.32.1, the Vala compiler
+/* GPhoto.c generated by valac 0.34.1, the Vala compiler
* generated from GPhoto.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1032,103 +1032,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
glong _tmp19_ = 0L;
glong _tmp20_ = 0L;
gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp2_ < ((glong) 0)) {
#line 1048 "GPhoto.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
start = _tmp3_ + _tmp4_;
#line 1057 "GPhoto.c"
}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp5_ < ((glong) 0)) {
#line 1063 "GPhoto.c"
glong _tmp6_ = 0L;
glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp6_ + _tmp7_;
#line 1072 "GPhoto.c"
}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp9_ >= ((glong) 0)) {
#line 1078 "GPhoto.c"
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = _tmp10_ <= _tmp11_;
#line 1087 "GPhoto.c"
} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = FALSE;
#line 1091 "GPhoto.c"
}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp13_ >= ((glong) 0)) {
#line 1099 "GPhoto.c"
glong _tmp14_ = 0L;
glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ <= _tmp15_;
#line 1108 "GPhoto.c"
} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
#line 1112 "GPhoto.c"
}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1134 "GPhoto.c"
}
@@ -1769,7 +1769,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp46_ = mins;
#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- _tmp47_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_INPUT_STREAM, GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
+ _tmp47_ = gdk_pixbuf_new_from_stream_at_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), IMPORT_PREVIEW_MAX_SCALE, IMPORT_PREVIEW_MAX_SCALE, TRUE, NULL, &_inner_error_);
#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp45_ = _tmp47_;
#line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2472,7 +2472,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp31_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp30_, _tmp30__length1, _gp_on_mins_destroyed_gdestroy_notify);
#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, G_TYPE_INPUT_STREAM, GInputStream);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream);
#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
buffer = (g_free (buffer), NULL);
#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2577,7 +2577,7 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_tmp51_ = NULL;
#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
- result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, G_TYPE_INPUT_STREAM, GInputStream);
+ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream);
#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
_g_object_unref0 (_tmp51_);
#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index 03f2d8d..2967842 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -1,4 +1,4 @@
-/* ImportPage.c generated by valac 0.32.1, the Vala compiler
+/* ImportPage.c generated by valac 0.34.1, the Vala compiler
* generated from ImportPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8171,15 +8171,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 8181 "ImportPage.c"
}
@@ -8202,103 +8202,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
glong _tmp19_ = 0L;
glong _tmp20_ = 0L;
gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp2_ < ((glong) 0)) {
#line 8214 "ImportPage.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
start = _tmp3_ + _tmp4_;
#line 8223 "ImportPage.c"
}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp5_ < ((glong) 0)) {
#line 8229 "ImportPage.c"
glong _tmp6_ = 0L;
glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp6_ + _tmp7_;
#line 8238 "ImportPage.c"
}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp9_ >= ((glong) 0)) {
#line 8244 "ImportPage.c"
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = _tmp10_ <= _tmp11_;
#line 8253 "ImportPage.c"
} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = FALSE;
#line 8257 "ImportPage.c"
}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp13_ >= ((glong) 0)) {
#line 8265 "ImportPage.c"
glong _tmp14_ = 0L;
glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ <= _tmp15_;
#line 8274 "ImportPage.c"
} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
#line 8278 "ImportPage.c"
}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 8300 "ImportPage.c"
}
@@ -13190,17 +13190,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 13198 "ImportPage.c"
}
diff --git a/src/config/Config.c b/src/config/Config.c
index 0bcb4d4..2f48a67 100644
--- a/src/config/Config.c
+++ b/src/config/Config.c
@@ -1,4 +1,4 @@
-/* Config.c generated by valac 0.32.1, the Vala compiler
+/* Config.c generated by valac 0.34.1, the Vala compiler
* generated from Config.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/config/ConfigurationInterfaces.c b/src/config/ConfigurationInterfaces.c
index 0e35565..d1fa9e7 100644
--- a/src/config/ConfigurationInterfaces.c
+++ b/src/config/ConfigurationInterfaces.c
@@ -1,4 +1,4 @@
-/* ConfigurationInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* ConfigurationInterfaces.c generated by valac 0.34.1, the Vala compiler
* generated from ConfigurationInterfaces.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -10669,13 +10669,13 @@ void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, g
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return;
#line 10676 "ConfigurationInterfaces.c"
}
@@ -10693,35 +10693,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* _tmp3_ = NULL;
gint _tmp3__length1 = 0;
gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 10722 "ConfigurationInterfaces.c"
}
diff --git a/src/config/GSettingsEngine.c b/src/config/GSettingsEngine.c
index c27e400..2459c8b 100644
--- a/src/config/GSettingsEngine.c
+++ b/src/config/GSettingsEngine.c
@@ -1,4 +1,4 @@
-/* GSettingsEngine.c generated by valac 0.32.1, the Vala compiler
+/* GSettingsEngine.c generated by valac 0.34.1, the Vala compiler
* generated from GSettingsEngine.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3100,11 +3100,11 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
#line 3110 "GSettingsEngine.c"
{
@@ -3119,73 +3119,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 3141 "GSettingsEngine.c"
goto __catch189_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 3150 "GSettingsEngine.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 3166 "GSettingsEngine.c"
goto __catch189_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 3177 "GSettingsEngine.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3191 "GSettingsEngine.c"
}
@@ -3193,24 +3193,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
__catch189_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
#line 3205 "GSettingsEngine.c"
}
__finally189:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 3216 "GSettingsEngine.c"
}
@@ -3222,19 +3222,19 @@ static gchar* string_strip (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3240 "GSettingsEngine.c"
}
@@ -3578,37 +3578,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 3594 "GSettingsEngine.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3602 "GSettingsEngine.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3614 "GSettingsEngine.c"
}
@@ -3628,112 +3628,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 3638 "GSettingsEngine.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 3644 "GSettingsEngine.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 3648 "GSettingsEngine.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 3652 "GSettingsEngine.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 3664 "GSettingsEngine.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 3674 "GSettingsEngine.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 3680 "GSettingsEngine.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 3694 "GSettingsEngine.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 3704 "GSettingsEngine.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 3710 "GSettingsEngine.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 3719 "GSettingsEngine.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3739 "GSettingsEngine.c"
}
diff --git a/src/core/Alteration.c b/src/core/Alteration.c
index 2bb624a..6e3ca88 100644
--- a/src/core/Alteration.c
+++ b/src/core/Alteration.c
@@ -1,4 +1,4 @@
-/* Alteration.c generated by valac 0.32.1, the Vala compiler
+/* Alteration.c generated by valac 0.34.1, the Vala compiler
* generated from Alteration.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -426,19 +426,19 @@ static gchar* string_strip (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 444 "Alteration.c"
}
diff --git a/src/core/ContainerSourceCollection.c b/src/core/ContainerSourceCollection.c
index 2e98ee8..0fa5e34 100644
--- a/src/core/ContainerSourceCollection.c
+++ b/src/core/ContainerSourceCollection.c
@@ -1,4 +1,4 @@
-/* ContainerSourceCollection.c generated by valac 0.32.1, the Vala compiler
+/* ContainerSourceCollection.c generated by valac 0.34.1, the Vala compiler
* generated from ContainerSourceCollection.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -394,27 +394,27 @@ ContainerSourceCollection* container_source_collection_construct (GType object_t
void* _tmp1__target = NULL;
const gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 37 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_val_if_fail (backlink_name != NULL, NULL);
-#line 37 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_val_if_fail (name != NULL, NULL);
-#line 39 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = name;
-#line 39 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = source_key_func;
-#line 39 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1__target = source_key_func_target;
-#line 39 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 40 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
self = (ContainerSourceCollection*) database_source_collection_construct (object_type, _tmp0_, _tmp1_, _tmp1__target);
-#line 41 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = backlink_name;
-#line 41 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = g_strdup (_tmp2_);
-#line 41 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_free0 (self->priv->backlink_name);
-#line 41 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 42 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
self->priv->backlink_name = _tmp3_;
-#line 37 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 38 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
return self;
#line 420 "ContainerSourceCollection.c"
}
@@ -428,40 +428,40 @@ static void container_source_collection_real_notify_backlink_removed (SourceColl
SourceBacklink* _tmp2_ = NULL;
ContainerSource* _tmp3_ = NULL;
ContainerSource* _tmp4_ = NULL;
-#line 48 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection);
-#line 48 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_SOURCE_BACKLINK (backlink));
-#line 48 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 50 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 51 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = backlink;
-#line 50 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 51 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = sources;
-#line 50 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 51 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
SOURCE_COLLECTION_CLASS (container_source_collection_parent_class)->notify_backlink_removed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp0_, _tmp1_);
-#line 52 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = backlink;
-#line 52 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = container_source_collection_convert_backlink_to_container (self, _tmp2_);
-#line 52 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- container = _tmp3_;
#line 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ container = _tmp3_;
+#line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp4_ = container;
-#line 53 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (_tmp4_ != NULL) {
#line 454 "ContainerSourceCollection.c"
ContainerSource* _tmp5_ = NULL;
GeeCollection* _tmp6_ = NULL;
-#line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp5_ = container;
-#line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp6_ = sources;
-#line 54 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 55 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_collection_notify_backlink_to_container_removed (self, _tmp5_, _tmp6_);
#line 463 "ContainerSourceCollection.c"
}
-#line 48 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 49 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (container);
#line 467 "ContainerSourceCollection.c"
}
@@ -474,17 +474,17 @@ static void container_source_collection_real_notify_container_contents_added (Co
ContainerSource* _tmp8_ = NULL;
GeeCollection* _tmp9_ = NULL;
gboolean _tmp10_ = FALSE;
-#line 57 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE (container));
-#line 57 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (added));
-#line 60 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = self->priv->holding_tank;
-#line 60 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = container;
-#line 60 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 60 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (_tmp2_) {
#line 490 "ContainerSourceCollection.c"
gboolean removed = FALSE;
@@ -493,40 +493,40 @@ static void container_source_collection_real_notify_container_contents_added (Co
gboolean _tmp5_ = FALSE;
gboolean _tmp6_ = FALSE;
ContainerSource* _tmp7_ = NULL;
-#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = self->priv->holding_tank;
-#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp4_ = container;
-#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp5_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
-#line 61 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- removed = _tmp5_;
#line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ removed = _tmp5_;
+#line 63 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp6_ = removed;
-#line 62 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 63 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_vala_assert (_tmp6_, "removed");
-#line 64 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 65 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp7_ = container;
-#line 64 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 65 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
source_collection_relink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
#line 513 "ContainerSourceCollection.c"
}
-#line 67 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp8_ = container;
-#line 67 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp9_ = added;
-#line 67 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp10_ = relinked;
-#line 67 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 68 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_signal_emit_by_name (self, "container-contents-added", _tmp8_, _tmp9_, _tmp10_);
#line 523 "ContainerSourceCollection.c"
}
void container_source_collection_notify_container_contents_added (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked) {
-#line 57 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 57 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 58 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_added (self, container, added, relinked);
#line 532 "ContainerSourceCollection.c"
}
@@ -536,26 +536,26 @@ static void container_source_collection_real_notify_container_contents_removed (
ContainerSource* _tmp0_ = NULL;
GeeCollection* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
-#line 70 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE (container));
-#line 70 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (removed));
-#line 72 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = container;
-#line 72 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = removed;
-#line 72 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = unlinked;
-#line 72 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 73 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_signal_emit_by_name (self, "container-contents-removed", _tmp0_, _tmp1_, _tmp2_);
#line 552 "ContainerSourceCollection.c"
}
void container_source_collection_notify_container_contents_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* removed, gboolean unlinked) {
-#line 70 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 70 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 71 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_removed (self, container, removed, unlinked);
#line 561 "ContainerSourceCollection.c"
}
@@ -567,32 +567,32 @@ static void container_source_collection_real_notify_container_contents_altered (
gboolean _tmp2_ = FALSE;
GeeCollection* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 75 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE (container));
-#line 75 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 75 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 78 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = container;
-#line 78 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = added;
-#line 78 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = relinked;
-#line 78 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = removed;
-#line 78 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp4_ = unlinked;
-#line 78 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 79 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_signal_emit_by_name (self, "container-contents-altered", _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
#line 589 "ContainerSourceCollection.c"
}
void container_source_collection_notify_container_contents_altered (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* added, gboolean relinked, GeeCollection* removed, gboolean unlinked) {
-#line 75 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 75 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 76 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_container_contents_altered (self, container, added, relinked, removed, unlinked);
#line 598 "ContainerSourceCollection.c"
}
@@ -601,80 +601,80 @@ void container_source_collection_notify_container_contents_altered (ContainerSou
static void container_source_collection_real_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) {
ContainerSource* _tmp0_ = NULL;
GeeCollection* _tmp1_ = NULL;
-#line 81 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE (container));
-#line 81 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 83 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = container;
-#line 83 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = sources;
-#line 83 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 84 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_signal_emit_by_name (self, "backlink-to-container-removed", _tmp0_, _tmp1_);
#line 615 "ContainerSourceCollection.c"
}
void container_source_collection_notify_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) {
-#line 81 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 81 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 82 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->notify_backlink_to_container_removed (self, container, sources);
#line 624 "ContainerSourceCollection.c"
}
static GeeCollection* container_source_collection_real_get_containers_holding_source (ContainerSourceCollection* self, DataSource* source) {
-#line 86 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_critical ("Type `%s' does not implement abstract method `container_source_collection_get_containers_holding_source'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 86 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
return NULL;
#line 633 "ContainerSourceCollection.c"
}
GeeCollection* container_source_collection_get_containers_holding_source (ContainerSourceCollection* self, DataSource* source) {
-#line 86 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL);
-#line 86 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 87 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
return CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->get_containers_holding_source (self, source);
#line 642 "ContainerSourceCollection.c"
}
static ContainerSource* container_source_collection_real_convert_backlink_to_container (ContainerSourceCollection* self, SourceBacklink* backlink) {
-#line 89 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_critical ("Type `%s' does not implement abstract method `container_source_collection_convert_backlink_to_container'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 89 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
return NULL;
#line 651 "ContainerSourceCollection.c"
}
ContainerSource* container_source_collection_convert_backlink_to_container (ContainerSourceCollection* self, SourceBacklink* backlink) {
-#line 89 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL);
-#line 89 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 90 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
return CONTAINER_SOURCE_COLLECTION_GET_CLASS (self)->convert_backlink_to_container (self, backlink);
#line 660 "ContainerSourceCollection.c"
}
void container_source_collection_freeze_attached_notifications (ContainerSourceCollection* self) {
-#line 91 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
#line 667 "ContainerSourceCollection.c"
{
GeeIterator* _collection_it = NULL;
GeeHashSet* _tmp0_ = NULL;
GeeIterator* _tmp1_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = self->priv->attached_collections;
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_collection_it = _tmp1_;
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
while (TRUE) {
#line 680 "ContainerSourceCollection.c"
GeeIterator* _tmp2_ = NULL;
@@ -683,31 +683,31 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC
GeeIterator* _tmp4_ = NULL;
gpointer _tmp5_ = NULL;
SourceCollection* _tmp6_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = _collection_it;
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = gee_iterator_next (_tmp2_);
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (!_tmp3_) {
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
break;
#line 695 "ContainerSourceCollection.c"
}
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp4_ = _collection_it;
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp5_ = gee_iterator_get (_tmp4_);
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- collection = (SourceCollection*) _tmp5_;
#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ collection = (SourceCollection*) _tmp5_;
+#line 94 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp6_ = collection;
-#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 94 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_data_collection_unref0 (collection);
#line 709 "ContainerSourceCollection.c"
}
-#line 92 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 93 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_collection_it);
#line 713 "ContainerSourceCollection.c"
}
@@ -715,20 +715,20 @@ void container_source_collection_freeze_attached_notifications (ContainerSourceC
void container_source_collection_thaw_attached_notifications (ContainerSourceCollection* self) {
-#line 96 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
#line 721 "ContainerSourceCollection.c"
{
GeeIterator* _collection_it = NULL;
GeeHashSet* _tmp0_ = NULL;
GeeIterator* _tmp1_ = NULL;
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = self->priv->attached_collections;
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_collection_it = _tmp1_;
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
while (TRUE) {
#line 734 "ContainerSourceCollection.c"
GeeIterator* _tmp2_ = NULL;
@@ -737,31 +737,31 @@ void container_source_collection_thaw_attached_notifications (ContainerSourceCol
GeeIterator* _tmp4_ = NULL;
gpointer _tmp5_ = NULL;
SourceCollection* _tmp6_ = NULL;
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = _collection_it;
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = gee_iterator_next (_tmp2_);
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (!_tmp3_) {
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
break;
#line 749 "ContainerSourceCollection.c"
}
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp4_ = _collection_it;
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp5_ = gee_iterator_get (_tmp4_);
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- collection = (SourceCollection*) _tmp5_;
#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ collection = (SourceCollection*) _tmp5_;
+#line 99 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp6_ = collection;
-#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 99 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_data_collection_unref0 (collection);
#line 763 "ContainerSourceCollection.c"
}
-#line 97 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 98 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_collection_it);
#line 767 "ContainerSourceCollection.c"
}
@@ -773,17 +773,17 @@ GeeCollection* container_source_collection_get_holding_tank (ContainerSourceColl
GeeHashSet* _tmp0_ = NULL;
GeeSet* _tmp1_ = NULL;
GeeSet* _tmp2_ = NULL;
-#line 101 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL);
#line 102 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), NULL);
+#line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = self->priv->holding_tank;
-#line 102 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = gee_abstract_set_get_read_only_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_SET, GeeAbstractSet));
-#line 102 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = _tmp1_;
-#line 102 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 102 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 103 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
return result;
#line 789 "ContainerSourceCollection.c"
}
@@ -792,15 +792,15 @@ GeeCollection* container_source_collection_get_holding_tank (ContainerSourceColl
void container_source_collection_init_add_unlinked (ContainerSourceCollection* self, ContainerSource* unlinked) {
GeeHashSet* _tmp0_ = NULL;
ContainerSource* _tmp1_ = NULL;
-#line 105 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 105 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_return_if_fail (IS_CONTAINER_SOURCE (unlinked));
#line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_return_if_fail (IS_CONTAINER_SOURCE (unlinked));
+#line 107 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = self->priv->holding_tank;
-#line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 107 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = unlinked;
-#line 106 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 107 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
#line 806 "ContainerSourceCollection.c"
}
@@ -809,15 +809,15 @@ void container_source_collection_init_add_unlinked (ContainerSourceCollection* s
void container_source_collection_init_add_many_unlinked (ContainerSourceCollection* self, GeeCollection* unlinked) {
GeeHashSet* _tmp0_ = NULL;
GeeCollection* _tmp1_ = NULL;
-#line 109 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 109 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_return_if_fail (GEE_IS_COLLECTION (unlinked));
#line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_return_if_fail (GEE_IS_COLLECTION (unlinked));
+#line 111 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = self->priv->holding_tank;
-#line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 111 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = unlinked;
-#line 110 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 111 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_);
#line 823 "ContainerSourceCollection.c"
}
@@ -829,31 +829,31 @@ gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCo
ContainerSource* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
ContainerSource* _tmp3_ = NULL;
-#line 113 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_val_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self), FALSE);
-#line 113 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_return_val_if_fail (IS_CONTAINER_SOURCE (source), FALSE);
#line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_return_val_if_fail (IS_CONTAINER_SOURCE (source), FALSE);
+#line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = self->priv->holding_tank;
-#line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = source;
-#line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 114 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- if (!_tmp2_) {
#line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ if (!_tmp2_) {
+#line 116 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
result = FALSE;
-#line 115 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 116 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
return result;
#line 849 "ContainerSourceCollection.c"
}
-#line 117 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 118 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = source;
-#line 117 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 118 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
source_collection_relink (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource));
-#line 119 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 120 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
result = TRUE;
-#line 119 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 120 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
return result;
#line 859 "ContainerSourceCollection.c"
}
@@ -862,28 +862,28 @@ gboolean container_source_collection_relink_from_holding_tank (ContainerSourceCo
static void container_source_collection_on_contained_sources_unlinking (ContainerSourceCollection* self, GeeCollection* unlinking) {
GeeHashMultiMap* map = NULL;
GeeHashMultiMap* _tmp0_ = NULL;
-#line 122 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 122 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_return_if_fail (GEE_IS_COLLECTION (unlinking));
#line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_return_if_fail (GEE_IS_COLLECTION (unlinking));
+#line 124 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_collection_freeze_attached_notifications (self);
-#line 125 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 126 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 125 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 126 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
map = _tmp0_;
#line 876 "ContainerSourceCollection.c"
{
GeeIterator* _source_it = NULL;
GeeCollection* _tmp1_ = NULL;
GeeIterator* _tmp2_ = NULL;
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = unlinking;
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_source_it = _tmp2_;
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
while (TRUE) {
#line 889 "ContainerSourceCollection.c"
GeeIterator* _tmp3_ = NULL;
@@ -896,56 +896,56 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
GeeCollection* _tmp8_ = NULL;
gboolean _tmp9_ = FALSE;
GeeCollection* _tmp10_ = NULL;
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = _source_it;
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp4_ = gee_iterator_next (_tmp3_);
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (!_tmp4_) {
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
break;
#line 908 "ContainerSourceCollection.c"
}
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp5_ = _source_it;
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp6_ = gee_iterator_get (_tmp5_);
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- source = (DataSource*) _tmp6_;
#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ source = (DataSource*) _tmp6_;
+#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp7_ = source;
-#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp8_ = container_source_collection_get_containers_holding_source (self, _tmp7_);
-#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- containers = _tmp8_;
#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ containers = _tmp8_;
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp10_ = containers;
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (_tmp10_ == NULL) {
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp9_ = TRUE;
#line 928 "ContainerSourceCollection.c"
} else {
GeeCollection* _tmp11_ = NULL;
gint _tmp12_ = 0;
gint _tmp13_ = 0;
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp11_ = containers;
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp12_ = gee_collection_get_size (_tmp11_);
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp13_ = _tmp12_;
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp9_ = _tmp13_ == 0;
#line 941 "ContainerSourceCollection.c"
}
-#line 130 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- if (_tmp9_) {
#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ if (_tmp9_) {
+#line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (containers);
-#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (source);
-#line 131 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 132 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
continue;
#line 951 "ContainerSourceCollection.c"
}
@@ -953,13 +953,13 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
GeeIterator* _container_it = NULL;
GeeCollection* _tmp14_ = NULL;
GeeIterator* _tmp15_ = NULL;
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp14_ = containers;
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_container_it = _tmp15_;
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
while (TRUE) {
#line 965 "ContainerSourceCollection.c"
GeeIterator* _tmp16_ = NULL;
@@ -974,57 +974,57 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
ContainerSource* _tmp24_ = NULL;
SourceBacklink* _tmp25_ = NULL;
SourceBacklink* _tmp26_ = NULL;
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp16_ = _container_it;
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp17_ = gee_iterator_next (_tmp16_);
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (!_tmp17_) {
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
break;
#line 986 "ContainerSourceCollection.c"
}
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp18_ = _container_it;
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp19_ = gee_iterator_get (_tmp18_);
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- container = (ContainerSource*) _tmp19_;
#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ container = (ContainerSource*) _tmp19_;
+#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp20_ = map;
-#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp21_ = container;
-#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp22_ = source;
-#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp21_, _tmp22_);
#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp21_, _tmp22_);
+#line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp23_ = source;
-#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp24_ = container;
-#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp25_ = container_source_get_backlink (_tmp24_);
-#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp26_ = _tmp25_;
-#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
data_source_set_backlink (_tmp23_, _tmp26_);
-#line 135 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 136 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_source_backlink_unref0 (_tmp26_);
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (container);
#line 1016 "ContainerSourceCollection.c"
}
-#line 133 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 134 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_container_it);
#line 1020 "ContainerSourceCollection.c"
}
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (containers);
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (source);
#line 1026 "ContainerSourceCollection.c"
}
-#line 128 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 129 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_source_it);
#line 1030 "ContainerSourceCollection.c"
}
@@ -1035,21 +1035,21 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
GeeSet* _tmp29_ = NULL;
GeeIterator* _tmp30_ = NULL;
GeeIterator* _tmp31_ = NULL;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp27_ = map;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp28_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_MULTI_MAP, GeeMultiMap));
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp29_ = _tmp28_;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp30_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp31_ = _tmp30_;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_tmp29_);
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_container_it = _tmp31_;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
while (TRUE) {
#line 1055 "ContainerSourceCollection.c"
GeeIterator* _tmp32_ = NULL;
@@ -1062,54 +1062,54 @@ static void container_source_collection_on_contained_sources_unlinking (Containe
ContainerSource* _tmp38_ = NULL;
GeeCollection* _tmp39_ = NULL;
GeeCollection* _tmp40_ = NULL;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp32_ = _container_it;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp33_ = gee_iterator_next (_tmp32_);
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (!_tmp33_) {
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
break;
#line 1074 "ContainerSourceCollection.c"
}
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp34_ = _container_it;
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp35_ = gee_iterator_get (_tmp34_);
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- container = (ContainerSource*) _tmp35_;
#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ container = (ContainerSource*) _tmp35_;
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp36_ = container;
-#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp37_ = map;
-#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp38_ = container;
-#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp39_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp38_);
-#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp40_ = _tmp39_;
-#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_break_link_many (_tmp36_, _tmp40_);
-#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 141 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_tmp40_);
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (container);
#line 1098 "ContainerSourceCollection.c"
}
-#line 139 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 140 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_container_it);
#line 1102 "ContainerSourceCollection.c"
}
-#line 142 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 143 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_collection_thaw_attached_notifications (self);
-#line 122 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 123 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (map);
#line 1108 "ContainerSourceCollection.c"
}
static gpointer _g_object_ref0 (gpointer self) {
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
return self ? g_object_ref (self) : NULL;
#line 1115 "ContainerSourceCollection.c"
}
@@ -1118,28 +1118,28 @@ static gpointer _g_object_ref0 (gpointer self) {
static void container_source_collection_on_contained_sources_relinked (ContainerSourceCollection* self, GeeCollection* relinked) {
GeeHashMultiMap* map = NULL;
GeeHashMultiMap* _tmp0_ = NULL;
-#line 145 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 145 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_return_if_fail (GEE_IS_COLLECTION (relinked));
#line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_return_if_fail (GEE_IS_COLLECTION (relinked));
+#line 147 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_collection_freeze_attached_notifications (self);
-#line 148 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 149 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = gee_hash_multi_map_new (TYPE_CONTAINER_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 148 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 149 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
map = _tmp0_;
#line 1132 "ContainerSourceCollection.c"
{
GeeIterator* _source_it = NULL;
GeeCollection* _tmp1_ = NULL;
GeeIterator* _tmp2_ = NULL;
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = relinked;
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_source_it = _tmp2_;
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
while (TRUE) {
#line 1145 "ContainerSourceCollection.c"
GeeIterator* _tmp3_ = NULL;
@@ -1153,58 +1153,58 @@ static void container_source_collection_on_contained_sources_relinked (Container
GeeList* _tmp9_ = NULL;
gboolean _tmp10_ = FALSE;
GeeList* _tmp11_ = NULL;
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = _source_it;
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp4_ = gee_iterator_next (_tmp3_);
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (!_tmp4_) {
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
break;
#line 1165 "ContainerSourceCollection.c"
}
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp5_ = _source_it;
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp6_ = gee_iterator_get (_tmp5_);
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- source = (DataSource*) _tmp6_;
#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ source = (DataSource*) _tmp6_;
+#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp7_ = source;
-#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp8_ = self->priv->backlink_name;
-#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp9_ = data_source_get_backlinks (_tmp7_, _tmp8_);
-#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- backlinks = _tmp9_;
#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ backlinks = _tmp9_;
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp11_ = backlinks;
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (_tmp11_ == NULL) {
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp10_ = TRUE;
#line 1187 "ContainerSourceCollection.c"
} else {
GeeList* _tmp12_ = NULL;
gint _tmp13_ = 0;
gint _tmp14_ = 0;
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp12_ = backlinks;
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp14_ = _tmp13_;
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp10_ = _tmp14_ == 0;
#line 1200 "ContainerSourceCollection.c"
}
-#line 153 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- if (_tmp10_) {
#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ if (_tmp10_) {
+#line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (backlinks);
-#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (source);
-#line 154 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 155 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
continue;
#line 1210 "ContainerSourceCollection.c"
}
@@ -1217,23 +1217,23 @@ static void container_source_collection_on_contained_sources_relinked (Container
gint _tmp18_ = 0;
gint _tmp19_ = 0;
gint _backlink_index = 0;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp15_ = backlinks;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_backlink_list = _tmp16_;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp17_ = _backlink_list;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp19_ = _tmp18_;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_backlink_size = _tmp19_;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_backlink_index = -1;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
while (TRUE) {
#line 1239 "ContainerSourceCollection.c"
gint _tmp20_ = 0;
@@ -1247,49 +1247,49 @@ static void container_source_collection_on_contained_sources_relinked (Container
SourceBacklink* _tmp26_ = NULL;
ContainerSource* _tmp27_ = NULL;
ContainerSource* _tmp28_ = NULL;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp20_ = _backlink_index;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_backlink_index = _tmp20_ + 1;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp21_ = _backlink_index;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp22_ = _backlink_size;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (!(_tmp21_ < _tmp22_)) {
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
break;
#line 1263 "ContainerSourceCollection.c"
}
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp23_ = _backlink_list;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp24_ = _backlink_index;
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp25_ = gee_list_get (_tmp23_, _tmp24_);
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- backlink = (SourceBacklink*) _tmp25_;
#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ backlink = (SourceBacklink*) _tmp25_;
+#line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp26_ = backlink;
-#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp27_ = container_source_collection_convert_backlink_to_container (self, _tmp26_);
-#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- container = _tmp27_;
#line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ container = _tmp27_;
+#line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp28_ = container;
-#line 158 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (_tmp28_ != NULL) {
#line 1283 "ContainerSourceCollection.c"
GeeHashMultiMap* _tmp29_ = NULL;
ContainerSource* _tmp30_ = NULL;
DataSource* _tmp31_ = NULL;
-#line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp29_ = map;
-#line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp30_ = container;
-#line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp31_ = source;
-#line 159 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 160 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp30_, _tmp31_);
#line 1295 "ContainerSourceCollection.c"
} else {
@@ -1299,44 +1299,44 @@ static void container_source_collection_on_contained_sources_relinked (Container
SourceBacklink* _tmp35_ = NULL;
gchar* _tmp36_ = NULL;
gchar* _tmp37_ = NULL;
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp32_ = source;
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp33_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp34_ = _tmp33_;
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp35_ = backlink;
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp36_ = source_backlink_to_string (_tmp35_);
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp37_ = _tmp36_;
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_warning ("ContainerSourceCollection.vala:161: Unable to relink %s to container b" \
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_warning ("ContainerSourceCollection.vala:162: Unable to relink %s to container b" \
"acklink %s", _tmp34_, _tmp37_);
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_free0 (_tmp37_);
-#line 161 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 162 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_free0 (_tmp34_);
#line 1321 "ContainerSourceCollection.c"
}
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (container);
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_source_backlink_unref0 (backlink);
#line 1327 "ContainerSourceCollection.c"
}
-#line 156 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 157 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_backlink_list);
#line 1331 "ContainerSourceCollection.c"
}
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (backlinks);
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (source);
#line 1337 "ContainerSourceCollection.c"
}
-#line 151 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 152 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_source_it);
#line 1341 "ContainerSourceCollection.c"
}
@@ -1347,21 +1347,21 @@ static void container_source_collection_on_contained_sources_relinked (Container
GeeSet* _tmp40_ = NULL;
GeeIterator* _tmp41_ = NULL;
GeeIterator* _tmp42_ = NULL;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp38_ = map;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp39_ = gee_multi_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_MULTI_MAP, GeeMultiMap));
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp40_ = _tmp39_;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp41_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp42_ = _tmp41_;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_tmp40_);
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_container_it = _tmp42_;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
while (TRUE) {
#line 1366 "ContainerSourceCollection.c"
GeeIterator* _tmp43_ = NULL;
@@ -1374,47 +1374,47 @@ static void container_source_collection_on_contained_sources_relinked (Container
ContainerSource* _tmp49_ = NULL;
GeeCollection* _tmp50_ = NULL;
GeeCollection* _tmp51_ = NULL;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp43_ = _container_it;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp44_ = gee_iterator_next (_tmp43_);
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (!_tmp44_) {
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
break;
#line 1385 "ContainerSourceCollection.c"
}
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp45_ = _container_it;
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp46_ = gee_iterator_get (_tmp45_);
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- container = (ContainerSource*) _tmp46_;
#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ container = (ContainerSource*) _tmp46_;
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp47_ = container;
-#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp48_ = map;
-#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp49_ = container;
-#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp50_ = gee_multi_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp49_);
-#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp51_ = _tmp50_;
-#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_establish_link_many (_tmp47_, _tmp51_);
-#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 169 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_tmp51_);
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (container);
#line 1409 "ContainerSourceCollection.c"
}
-#line 167 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 168 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_container_it);
#line 1413 "ContainerSourceCollection.c"
}
-#line 170 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 171 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_collection_thaw_attached_notifications (self);
-#line 145 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 146 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (map);
#line 1419 "ContainerSourceCollection.c"
}
@@ -1424,17 +1424,17 @@ static void container_source_collection_on_contained_source_destroyed (Container
GeeIterator* iter = NULL;
GeeHashSet* _tmp0_ = NULL;
GeeIterator* _tmp1_ = NULL;
-#line 173 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 173 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_return_if_fail (IS_DATA_SOURCE (source));
#line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_return_if_fail (IS_DATA_SOURCE (source));
+#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = self->priv->holding_tank;
-#line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- iter = _tmp1_;
#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ iter = _tmp1_;
+#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
while (TRUE) {
#line 1439 "ContainerSourceCollection.c"
GeeIterator* _tmp2_ = NULL;
@@ -1445,60 +1445,60 @@ static void container_source_collection_on_contained_source_destroyed (Container
gboolean _tmp6_ = FALSE;
ContainerSource* _tmp7_ = NULL;
gboolean _tmp8_ = FALSE;
-#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = iter;
-#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = gee_iterator_next (_tmp2_);
-#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (!_tmp3_) {
-#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
break;
#line 1456 "ContainerSourceCollection.c"
}
-#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp4_ = iter;
-#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp5_ = gee_iterator_get (_tmp4_);
-#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 177 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container = (ContainerSource*) _tmp5_;
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp7_ = container;
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp8_ = container_source_has_links (_tmp7_);
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (!_tmp8_) {
#line 1470 "ContainerSourceCollection.c"
ContainerSource* _tmp9_ = NULL;
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp9_ = container;
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp6_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_TAG);
#line 1476 "ContainerSourceCollection.c"
} else {
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp6_ = FALSE;
#line 1480 "ContainerSourceCollection.c"
}
-#line 180 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (_tmp6_) {
#line 1484 "ContainerSourceCollection.c"
GeeIterator* _tmp10_ = NULL;
ContainerSource* _tmp11_ = NULL;
-#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp10_ = iter;
-#line 181 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- gee_iterator_remove (_tmp10_);
#line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ gee_iterator_remove (_tmp10_);
+#line 183 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp11_ = container;
-#line 182 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 183 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
data_source_destroy_orphan (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_SOURCE, DataSource), TRUE);
#line 1495 "ContainerSourceCollection.c"
}
-#line 175 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 176 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (container);
#line 1499 "ContainerSourceCollection.c"
}
-#line 173 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 174 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (iter);
#line 1503 "ContainerSourceCollection.c"
}
@@ -1507,22 +1507,22 @@ static void container_source_collection_on_contained_source_destroyed (Container
static void container_source_collection_real_notify_item_destroyed (SourceCollection* base, DataSource* source) {
ContainerSourceCollection * self;
DataSource* _tmp10_ = NULL;
-#line 187 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection);
-#line 187 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_DATA_SOURCE (source));
#line 1514 "ContainerSourceCollection.c"
{
GeeIterator* _collection_it = NULL;
GeeHashSet* _tmp0_ = NULL;
GeeIterator* _tmp1_ = NULL;
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = self->priv->attached_collections;
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_collection_it = _tmp1_;
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
while (TRUE) {
#line 1527 "ContainerSourceCollection.c"
GeeIterator* _tmp2_ = NULL;
@@ -1534,45 +1534,45 @@ static void container_source_collection_real_notify_item_destroyed (SourceCollec
DataSource* _tmp7_ = NULL;
SourceBacklink* _tmp8_ = NULL;
SourceBacklink* _tmp9_ = NULL;
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = _collection_it;
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = gee_iterator_next (_tmp2_);
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (!_tmp3_) {
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
break;
#line 1545 "ContainerSourceCollection.c"
}
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp4_ = _collection_it;
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp5_ = gee_iterator_get (_tmp4_);
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- collection = (SourceCollection*) _tmp5_;
#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ collection = (SourceCollection*) _tmp5_;
+#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp6_ = collection;
-#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp7_ = source;
-#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp8_ = container_source_get_backlink (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONTAINER_SOURCE, ContainerSource));
-#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp9_ = _tmp8_;
-#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
source_collection_remove_backlink (_tmp6_, _tmp9_);
-#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 190 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_source_backlink_unref0 (_tmp9_);
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_data_collection_unref0 (collection);
#line 1567 "ContainerSourceCollection.c"
}
-#line 188 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 189 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_collection_it);
#line 1571 "ContainerSourceCollection.c"
}
-#line 192 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 193 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp10_ = source;
-#line 192 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 193 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
SOURCE_COLLECTION_CLASS (container_source_collection_parent_class)->notify_item_destroyed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), TYPE_SOURCE_COLLECTION, SourceCollection), _tmp10_);
#line 1577 "ContainerSourceCollection.c"
}
@@ -1582,22 +1582,22 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con
ContainerSource* _tmp21_ = NULL;
Marker* _tmp22_ = NULL;
Marker* _tmp23_ = NULL;
-#line 199 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 199 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE (container));
#line 1589 "ContainerSourceCollection.c"
{
GeeIterator* _collection_it = NULL;
GeeHashSet* _tmp0_ = NULL;
GeeIterator* _tmp1_ = NULL;
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = self->priv->attached_collections;
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_collection_it = _tmp1_;
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
while (TRUE) {
#line 1602 "ContainerSourceCollection.c"
GeeIterator* _tmp2_ = NULL;
@@ -1611,37 +1611,37 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con
SourceBacklink* _tmp9_ = NULL;
gboolean _tmp10_ = FALSE;
gboolean _tmp11_ = FALSE;
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = _collection_it;
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = gee_iterator_next (_tmp2_);
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (!_tmp3_) {
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
break;
#line 1622 "ContainerSourceCollection.c"
}
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp4_ = _collection_it;
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp5_ = gee_iterator_get (_tmp4_);
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- collection = (SourceCollection*) _tmp5_;
#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ collection = (SourceCollection*) _tmp5_;
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp6_ = collection;
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp7_ = container;
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp8_ = container_source_get_backlink (_tmp7_);
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp9_ = _tmp8_;
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp10_ = source_collection_has_backlink (_tmp6_, _tmp9_);
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp11_ = _tmp10_;
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_source_backlink_unref0 (_tmp9_);
-#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (_tmp11_) {
#line 1646 "ContainerSourceCollection.c"
ContainerSource* _tmp12_ = NULL;
@@ -1654,85 +1654,85 @@ void container_source_collection_evaporate (ContainerSourceCollection* self, Con
ContainerSource* _tmp18_ = NULL;
gboolean _tmp19_ = FALSE;
gboolean _tmp20_ = FALSE;
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp12_ = container;
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp13_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp14_ = _tmp13_;
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp15_ = source_collection_unlink_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp14_, NULL, NULL);
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp16_ = _tmp15_;
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_tmp16_);
-#line 202 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- _g_object_unref0 (_tmp14_);
#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ _g_object_unref0 (_tmp14_);
+#line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp17_ = self->priv->holding_tank;
-#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp18_ = container;
-#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp19_ = gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp18_);
-#line 203 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- added = _tmp19_;
#line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ added = _tmp19_;
+#line 205 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp20_ = added;
-#line 204 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- _vala_assert (_tmp20_, "added");
#line 205 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ _vala_assert (_tmp20_, "added");
+#line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_data_collection_unref0 (collection);
-#line 205 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_collection_it);
-#line 205 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 206 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
return;
#line 1689 "ContainerSourceCollection.c"
}
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_data_collection_unref0 (collection);
#line 1693 "ContainerSourceCollection.c"
}
-#line 200 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 201 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_collection_it);
#line 1697 "ContainerSourceCollection.c"
}
-#line 209 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp21_ = container;
-#line 209 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp22_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_OBJECT, DataObject));
-#line 209 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp23_ = _tmp22_;
-#line 209 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
source_collection_destroy_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp23_, TRUE, NULL, NULL, NULL);
-#line 209 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 210 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_tmp23_);
#line 1709 "ContainerSourceCollection.c"
}
static void _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) {
-#line 220 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_collection_on_contained_sources_unlinking ((ContainerSourceCollection*) self, unlinking);
#line 1716 "ContainerSourceCollection.c"
}
static void _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) {
-#line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_collection_on_contained_sources_relinked ((ContainerSourceCollection*) self, relinked);
#line 1723 "ContainerSourceCollection.c"
}
static void _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
-#line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_collection_on_contained_source_destroyed ((ContainerSourceCollection*) self, source);
#line 1730 "ContainerSourceCollection.c"
}
static void _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
-#line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_collection_on_contained_source_destroyed ((ContainerSourceCollection*) self, source);
#line 1737 "ContainerSourceCollection.c"
}
@@ -1748,17 +1748,17 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s
SourceCollection* _tmp11_ = NULL;
SourceCollection* _tmp12_ = NULL;
SourceCollection* _tmp13_ = NULL;
-#line 212 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
-#line 212 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_return_if_fail (IS_SOURCE_COLLECTION (collection));
#line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_return_if_fail (IS_SOURCE_COLLECTION (collection));
+#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = self->priv->attached_collections;
-#line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = collection;
-#line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 213 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (_tmp2_) {
#line 1763 "ContainerSourceCollection.c"
SourceCollection* _tmp3_ = NULL;
@@ -1766,48 +1766,48 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = collection;
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp4_ = data_collection_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection));
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp5_ = _tmp4_;
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp6_ = data_collection_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp7_ = _tmp6_;
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_warning ("ContainerSourceCollection.vala:214: attempted to multiple-attach '%s' " \
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_warning ("ContainerSourceCollection.vala:215: attempted to multiple-attach '%s' " \
"to '%s'", _tmp5_, _tmp7_);
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_free0 (_tmp7_);
-#line 214 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- _g_free0 (_tmp5_);
#line 215 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ _g_free0 (_tmp5_);
+#line 216 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
return;
#line 1787 "ContainerSourceCollection.c"
}
-#line 218 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp8_ = self->priv->attached_collections;
-#line 218 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp9_ = collection;
-#line 218 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 219 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_);
-#line 220 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp10_ = collection;
-#line 220 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_signal_connect (_tmp10_, "items-unlinking", (GCallback) _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking, self);
#line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_signal_connect (_tmp10_, "items-unlinking", (GCallback) _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking, self);
+#line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp11_ = collection;
-#line 221 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_signal_connect (_tmp11_, "items-relinked", (GCallback) _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked, self);
#line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_signal_connect (_tmp11_, "items-relinked", (GCallback) _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked, self);
+#line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp12_ = collection;
-#line 222 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_signal_connect (_tmp12_, "item-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed, self);
#line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_signal_connect (_tmp12_, "item-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed, self);
+#line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp13_ = collection;
-#line 223 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 224 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_signal_connect (_tmp13_, "unlinked-destroyed", (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self);
#line 1811 "ContainerSourceCollection.c"
}
@@ -1815,20 +1815,20 @@ void container_source_collection_attach_collection (ContainerSourceCollection* s
void container_source_collection_detach_all_collections (ContainerSourceCollection* self) {
GeeHashSet* _tmp14_ = NULL;
-#line 226 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE_COLLECTION (self));
#line 1819 "ContainerSourceCollection.c"
{
GeeIterator* _collection_it = NULL;
GeeHashSet* _tmp0_ = NULL;
GeeIterator* _tmp1_ = NULL;
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp0_ = self->priv->attached_collections;
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp1_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_collection_it = _tmp1_;
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
while (TRUE) {
#line 1832 "ContainerSourceCollection.c"
GeeIterator* _tmp2_ = NULL;
@@ -1844,57 +1844,57 @@ void container_source_collection_detach_all_collections (ContainerSourceCollecti
guint _tmp11_ = 0U;
SourceCollection* _tmp12_ = NULL;
guint _tmp13_ = 0U;
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp2_ = _collection_it;
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp3_ = gee_iterator_next (_tmp2_);
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
if (!_tmp3_) {
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
break;
#line 1854 "ContainerSourceCollection.c"
}
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp4_ = _collection_it;
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp5_ = gee_iterator_get (_tmp4_);
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- collection = (SourceCollection*) _tmp5_;
#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ collection = (SourceCollection*) _tmp5_;
+#line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp6_ = collection;
-#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_signal_parse_name ("items-unlinking", TYPE_SOURCE_COLLECTION, &_tmp7_, NULL, FALSE);
-#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking, self);
#line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _container_source_collection_on_contained_sources_unlinking_source_collection_items_unlinking, self);
+#line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp8_ = collection;
-#line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_signal_parse_name ("items-relinked", TYPE_SOURCE_COLLECTION, &_tmp9_, NULL, FALSE);
-#line 229 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked, self);
#line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _container_source_collection_on_contained_sources_relinked_source_collection_items_relinked, self);
+#line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp10_ = collection;
-#line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE);
-#line 230 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
- g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed, self);
#line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+ g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_item_destroyed, self);
+#line 232 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp12_ = collection;
-#line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 232 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_signal_parse_name ("unlinked-destroyed", TYPE_SOURCE_COLLECTION, &_tmp13_, NULL, FALSE);
-#line 231 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 232 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _container_source_collection_on_contained_source_destroyed_source_collection_unlinked_destroyed, self);
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_data_collection_unref0 (collection);
#line 1888 "ContainerSourceCollection.c"
}
-#line 227 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 228 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (_collection_it);
#line 1892 "ContainerSourceCollection.c"
}
-#line 234 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 235 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_tmp14_ = self->priv->attached_collections;
-#line 234 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 235 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
gee_abstract_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1898 "ContainerSourceCollection.c"
}
@@ -1992,9 +1992,9 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOOLEAN_OBJECT_BOOLEAN (
static void container_source_collection_real_backlink_to_container_removed (ContainerSourceCollection* self, ContainerSource* container, GeeCollection* sources) {
-#line 33 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 34 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (IS_CONTAINER_SOURCE (container));
-#line 33 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 34 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
g_return_if_fail (GEE_IS_COLLECTION (sources));
#line 1998 "ContainerSourceCollection.c"
}
@@ -2095,7 +2095,7 @@ static void container_source_collection_finalize (DataCollection* obj) {
ContainerSourceCollection * self;
#line 15 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CONTAINER_SOURCE_COLLECTION, ContainerSourceCollection);
-#line 45 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
+#line 46 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
container_source_collection_detach_all_collections (self);
#line 16 "/home/jens/Source/shotwell/src/core/ContainerSourceCollection.vala"
_g_object_unref0 (self->priv->attached_collections);
diff --git a/src/core/ContainerSourceCollection.vala b/src/core/ContainerSourceCollection.vala
index a5b0fbc..cf6218a 100644
--- a/src/core/ContainerSourceCollection.vala
+++ b/src/core/ContainerSourceCollection.vala
@@ -18,15 +18,16 @@ public abstract class ContainerSourceCollection : DatabaseSourceCollection {
private Gee.HashSet<ContainerSource> holding_tank = new Gee.HashSet<ContainerSource>();
public virtual signal void container_contents_added(ContainerSource container,
- Gee.Collection<DataSource> added, bool relinked) {
+ Gee.Collection<DataObject> added, bool relinked) {
}
public virtual signal void container_contents_removed(ContainerSource container,
- Gee.Collection<DataSource> removed, bool unlinked) {
+ Gee.Collection<DataObject> removed, bool unlinked) {
}
public virtual signal void container_contents_altered(ContainerSource container,
- Gee.Collection<DataSource>? added, bool relinked, Gee.Collection<DataSource>? removed,
+ Gee.Collection<DataObject>? added, bool relinked,
+ Gee.Collection<DataObject>? removed,
bool unlinked) {
}
@@ -55,7 +56,7 @@ public abstract class ContainerSourceCollection : DatabaseSourceCollection {
}
public virtual void notify_container_contents_added(ContainerSource container,
- Gee.Collection<DataSource> added, bool relinked) {
+ Gee.Collection<DataObject> added, bool relinked) {
// if container is in holding tank, remove it now and relink to collection
if (holding_tank.contains(container)) {
bool removed = holding_tank.remove(container);
@@ -68,12 +69,12 @@ public abstract class ContainerSourceCollection : DatabaseSourceCollection {
}
public virtual void notify_container_contents_removed(ContainerSource container,
- Gee.Collection<DataSource> removed, bool unlinked) {
+ Gee.Collection<DataObject> removed, bool unlinked) {
container_contents_removed(container, removed, unlinked);
}
public virtual void notify_container_contents_altered(ContainerSource container,
- Gee.Collection<DataSource>? added, bool relinked, Gee.Collection<DataSource>? removed,
+ Gee.Collection<DataObject>? added, bool relinked, Gee.Collection<DataSource>? removed,
bool unlinked) {
container_contents_altered(container, added, relinked, removed, unlinked);
}
diff --git a/src/core/Core.c b/src/core/Core.c
index 7fd60d2..5c9e67d 100644
--- a/src/core/Core.c
+++ b/src/core/Core.c
@@ -1,4 +1,4 @@
-/* Core.c generated by valac 0.32.1, the Vala compiler
+/* Core.c generated by valac 0.34.1, the Vala compiler
* generated from Core.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataCollection.c b/src/core/DataCollection.c
index 7040412..457e2f7 100644
--- a/src/core/DataCollection.c
+++ b/src/core/DataCollection.c
@@ -1,4 +1,4 @@
-/* DataCollection.c generated by valac 0.32.1, the Vala compiler
+/* DataCollection.c generated by valac 0.34.1, the Vala compiler
* generated from DataCollection.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataObject.c b/src/core/DataObject.c
index 7aaf2eb..84a9366 100644
--- a/src/core/DataObject.c
+++ b/src/core/DataObject.c
@@ -1,4 +1,4 @@
-/* DataObject.c generated by valac 0.32.1, the Vala compiler
+/* DataObject.c generated by valac 0.34.1, the Vala compiler
* generated from DataObject.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataSet.c b/src/core/DataSet.c
index 75c2ca2..6d2c3c6 100644
--- a/src/core/DataSet.c
+++ b/src/core/DataSet.c
@@ -1,4 +1,4 @@
-/* DataSet.c generated by valac 0.32.1, the Vala compiler
+/* DataSet.c generated by valac 0.34.1, the Vala compiler
* generated from DataSet.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index 2b48942..fca0c0a 100644
--- a/src/core/DataSource.c
+++ b/src/core/DataSource.c
@@ -1,4 +1,4 @@
-/* DataSource.c generated by valac 0.32.1, the Vala compiler
+/* DataSource.c generated by valac 0.34.1, the Vala compiler
* generated from DataSource.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3356,19 +3356,19 @@ static gchar* string_strip (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3373 "DataSource.c"
}
@@ -3499,17 +3499,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3514 "DataSource.c"
}
@@ -3745,15 +3745,15 @@ static gint64 int64_parse (const gchar* str) {
gint64 result = 0LL;
const gchar* _tmp0_ = NULL;
gint64 _tmp1_ = 0LL;
-#line 679 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (str != NULL, 0LL);
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3758 "DataSource.c"
}
diff --git a/src/core/DataSourceTypes.c b/src/core/DataSourceTypes.c
index 0abd6e8..a576ccc 100644
--- a/src/core/DataSourceTypes.c
+++ b/src/core/DataSourceTypes.c
@@ -1,4 +1,4 @@
-/* DataSourceTypes.c generated by valac 0.32.1, the Vala compiler
+/* DataSourceTypes.c generated by valac 0.34.1, the Vala compiler
* generated from DataSourceTypes.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataView.c b/src/core/DataView.c
index 40153fc..7729be1 100644
--- a/src/core/DataView.c
+++ b/src/core/DataView.c
@@ -1,4 +1,4 @@
-/* DataView.c generated by valac 0.32.1, the Vala compiler
+/* DataView.c generated by valac 0.34.1, the Vala compiler
* generated from DataView.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DataViewTypes.c b/src/core/DataViewTypes.c
index 0e55db0..cbb3a73 100644
--- a/src/core/DataViewTypes.c
+++ b/src/core/DataViewTypes.c
@@ -1,4 +1,4 @@
-/* DataViewTypes.c generated by valac 0.32.1, the Vala compiler
+/* DataViewTypes.c generated by valac 0.34.1, the Vala compiler
* generated from DataViewTypes.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/DatabaseSourceCollection.c b/src/core/DatabaseSourceCollection.c
index b83be40..b9606dd 100644
--- a/src/core/DatabaseSourceCollection.c
+++ b/src/core/DatabaseSourceCollection.c
@@ -1,4 +1,4 @@
-/* DatabaseSourceCollection.c generated by valac 0.32.1, the Vala compiler
+/* DatabaseSourceCollection.c generated by valac 0.34.1, the Vala compiler
* generated from DatabaseSourceCollection.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c
index 6321f92..fc92bbd 100644
--- a/src/core/SourceCollection.c
+++ b/src/core/SourceCollection.c
@@ -1,4 +1,4 @@
-/* SourceCollection.c generated by valac 0.32.1, the Vala compiler
+/* SourceCollection.c generated by valac 0.34.1, the Vala compiler
* generated from SourceCollection.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/SourceHoldingTank.c b/src/core/SourceHoldingTank.c
index ed7d671..c1b3e97 100644
--- a/src/core/SourceHoldingTank.c
+++ b/src/core/SourceHoldingTank.c
@@ -1,4 +1,4 @@
-/* SourceHoldingTank.c generated by valac 0.32.1, the Vala compiler
+/* SourceHoldingTank.c generated by valac 0.34.1, the Vala compiler
* generated from SourceHoldingTank.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/SourceInterfaces.c b/src/core/SourceInterfaces.c
index 5cfc5a9..4df09cd 100644
--- a/src/core/SourceInterfaces.c
+++ b/src/core/SourceInterfaces.c
@@ -1,4 +1,4 @@
-/* SourceInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* SourceInterfaces.c generated by valac 0.34.1, the Vala compiler
* generated from SourceInterfaces.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/Tracker.c b/src/core/Tracker.c
index fa66f0e..1d1bd50 100644
--- a/src/core/Tracker.c
+++ b/src/core/Tracker.c
@@ -1,4 +1,4 @@
-/* Tracker.c generated by valac 0.32.1, the Vala compiler
+/* Tracker.c generated by valac 0.34.1, the Vala compiler
* generated from Tracker.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/core/ViewCollection.c b/src/core/ViewCollection.c
index 597091c..7c35370 100644
--- a/src/core/ViewCollection.c
+++ b/src/core/ViewCollection.c
@@ -1,4 +1,4 @@
-/* ViewCollection.c generated by valac 0.32.1, the Vala compiler
+/* ViewCollection.c generated by valac 0.34.1, the Vala compiler
* generated from ViewCollection.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -4128,27 +4128,27 @@ static void view_collection_real_items_altered (DataCollection* base, GeeMap* ma
GeeMap* _tmp0_ = NULL;
GeeSet* _tmp1_ = NULL;
GeeSet* _tmp2_ = NULL;
- GeeSet* _tmp3_ = NULL;
+ GeeCollection* _tmp3_ = NULL;
GeeMap* _tmp4_ = NULL;
#line 648 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 648 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (GEE_IS_MAP (map));
-#line 649 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = map;
-#line 649 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 649 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _tmp1_;
-#line 649 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _tmp3_ = _tmp2_;
-#line 649 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_filter_altered_items (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 649 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
+#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view_collection_filter_altered_items (self, _tmp3_);
+#line 650 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp3_);
-#line 651 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 652 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = map;
-#line 651 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 652 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
DATA_COLLECTION_CLASS (view_collection_parent_class)->items_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp4_);
#line 4153 "ViewCollection.c"
}
@@ -4166,23 +4166,23 @@ static void view_collection_real_set_comparator (DataCollection* base, Comparato
void* _tmp7__target = NULL;
ComparatorPredicate _tmp8_ = NULL;
void* _tmp8__target = NULL;
-#line 654 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
+#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->selected;
-#line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = comparator;
-#line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1__target = comparator_target;
-#line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = predicate;
-#line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2__target = predicate_target;
-#line 655 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_set_set_comparator (_tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ data_set_set_comparator (_tmp0_, _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
+#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = self->priv->visible;
-#line 656 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp3_ != NULL) {
#line 4187 "ViewCollection.c"
DataSet* _tmp4_ = NULL;
@@ -4190,29 +4190,29 @@ static void view_collection_real_set_comparator (DataCollection* base, Comparato
void* _tmp5__target = NULL;
ComparatorPredicate _tmp6_ = NULL;
void* _tmp6__target = NULL;
-#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = self->priv->visible;
-#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = comparator;
-#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5__target = comparator_target;
-#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = predicate;
-#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6__target = predicate_target;
-#line 657 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 658 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_set_set_comparator (_tmp4_, _tmp5_, _tmp5__target, _tmp6_, _tmp6__target);
#line 4205 "ViewCollection.c"
}
-#line 659 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = comparator;
-#line 659 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7__target = comparator_target;
-#line 659 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = predicate;
-#line 659 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8__target = predicate_target;
-#line 659 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 660 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
DATA_COLLECTION_CLASS (view_collection_parent_class)->set_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp7__target, _tmp8_, _tmp8__target);
#line 4217 "ViewCollection.c"
}
@@ -4222,25 +4222,25 @@ static void view_collection_real_reset_comparator (DataCollection* base) {
ViewCollection * self;
DataSet* _tmp0_ = NULL;
DataSet* _tmp1_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 663 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
+#line 664 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->selected;
-#line 663 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_set_reset_comparator (_tmp0_);
#line 664 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ data_set_reset_comparator (_tmp0_);
+#line 665 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->visible;
-#line 664 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 665 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
#line 4235 "ViewCollection.c"
DataSet* _tmp2_ = NULL;
-#line 665 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 666 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->visible;
-#line 665 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 666 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_set_reset_comparator (_tmp2_);
#line 4241 "ViewCollection.c"
}
-#line 667 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 668 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
DATA_COLLECTION_CLASS (view_collection_parent_class)->reset_comparator (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 4245 "ViewCollection.c"
}
@@ -4251,37 +4251,37 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) {
GeeCollection* result = NULL;
GeeCollection* _tmp0_ = NULL;
DataSet* _tmp1_ = NULL;
-#line 670 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->visible;
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
#line 4260 "ViewCollection.c"
DataSet* _tmp2_ = NULL;
GeeList* _tmp3_ = NULL;
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->visible;
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = data_set_get_all (_tmp2_);
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
#line 4271 "ViewCollection.c"
} else {
GeeCollection* _tmp4_ = NULL;
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp4_;
#line 4280 "ViewCollection.c"
}
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
-#line 671 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 672 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4286 "ViewCollection.c"
}
@@ -4290,13 +4290,13 @@ static GeeCollection* view_collection_real_get_all (DataCollection* base) {
GeeCollection* view_collection_get_all_unfiltered (ViewCollection* self) {
GeeCollection* result = NULL;
GeeCollection* _tmp0_ = NULL;
-#line 674 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 675 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 675 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
-#line 675 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 676 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4301 "ViewCollection.c"
}
@@ -4307,33 +4307,33 @@ static gint view_collection_real_get_count (DataCollection* base) {
gint result = 0;
gint _tmp0_ = 0;
DataSet* _tmp1_ = NULL;
-#line 678 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->visible;
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
#line 4316 "ViewCollection.c"
DataSet* _tmp2_ = NULL;
gint _tmp3_ = 0;
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->visible;
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = data_set_get_count (_tmp2_);
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp3_;
#line 4325 "ViewCollection.c"
} else {
gint _tmp4_ = 0;
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp4_;
#line 4332 "ViewCollection.c"
}
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
-#line 679 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 680 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4338 "ViewCollection.c"
}
@@ -4342,13 +4342,13 @@ static gint view_collection_real_get_count (DataCollection* base) {
gint view_collection_get_unfiltered_count (ViewCollection* self) {
gint result = 0;
gint _tmp0_ = 0;
-#line 682 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
#line 683 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
+#line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 683 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
-#line 683 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 684 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4353 "ViewCollection.c"
}
@@ -4359,43 +4359,43 @@ static DataObject* view_collection_real_get_at (DataCollection* base, gint index
DataObject* result = NULL;
DataObject* _tmp0_ = NULL;
DataSet* _tmp1_ = NULL;
-#line 686 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->visible;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
#line 4368 "ViewCollection.c"
DataSet* _tmp2_ = NULL;
gint _tmp3_ = 0;
DataObject* _tmp4_ = NULL;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->visible;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = index;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = data_set_get_at (_tmp2_, _tmp3_);
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp4_;
#line 4382 "ViewCollection.c"
} else {
gint _tmp5_ = 0;
DataObject* _tmp6_ = NULL;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = index;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_);
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp6_;
#line 4394 "ViewCollection.c"
}
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
-#line 687 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 688 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4400 "ViewCollection.c"
}
@@ -4406,41 +4406,41 @@ static gint view_collection_real_index_of (DataCollection* base, DataObject* obj
gint result = 0;
gint _tmp0_ = 0;
DataSet* _tmp1_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
-#line 690 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_DATA_OBJECT (object), 0);
#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_DATA_OBJECT (object), 0);
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->visible;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
#line 4417 "ViewCollection.c"
DataSet* _tmp2_ = NULL;
DataObject* _tmp3_ = NULL;
gint _tmp4_ = 0;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->visible;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = object;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = data_set_index_of (_tmp2_, _tmp3_);
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp4_;
#line 4429 "ViewCollection.c"
} else {
DataObject* _tmp5_ = NULL;
gint _tmp6_ = 0;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = object;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp5_);
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp6_;
#line 4439 "ViewCollection.c"
}
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
-#line 691 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 692 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4445 "ViewCollection.c"
}
@@ -4453,29 +4453,29 @@ static gboolean view_collection_real_contains (DataCollection* base, DataObject*
gboolean _tmp1_ = FALSE;
DataObject* _tmp2_ = NULL;
gboolean _tmp3_ = FALSE;
-#line 694 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 695 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
-#line 694 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 695 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 697 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = object;
-#line 697 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->contains (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp0_);
-#line 697 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp1_) {
#line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (!_tmp1_) {
+#line 699 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = FALSE;
-#line 698 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 699 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4470 "ViewCollection.c"
}
-#line 701 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = object;
-#line 701 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = view_collection_is_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView));
-#line 701 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp3_;
-#line 701 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 702 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4480 "ViewCollection.c"
}
@@ -4485,38 +4485,38 @@ static DataView* view_collection_real_get_first (ViewCollection* self) {
DataView* result = NULL;
DataView* _tmp0_ = NULL;
gint _tmp1_ = 0;
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ > 0) {
#line 4492 "ViewCollection.c"
DataObject* _tmp2_ = NULL;
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), 0);
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
#line 4500 "ViewCollection.c"
} else {
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = NULL;
#line 4506 "ViewCollection.c"
}
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
-#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 706 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4512 "ViewCollection.c"
}
DataView* view_collection_get_first (ViewCollection* self) {
-#line 704 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 704 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 705 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_COLLECTION_GET_CLASS (self)->get_first (self);
#line 4521 "ViewCollection.c"
}
@@ -4540,25 +4540,25 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
gint num_views = 0;
gint _tmp2_ = 0;
DataView* _tmp17_ = NULL;
-#line 720 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 720 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp0_ < 1) {
#line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp0_ < 1) {
+#line 722 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = NULL;
-#line 721 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 722 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4551 "ViewCollection.c"
}
-#line 724 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view_collection_get_first (self);
-#line 724 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- dv = _tmp1_;
#line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ dv = _tmp1_;
+#line 726 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 725 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 726 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
num_views = _tmp2_;
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 4563 "ViewCollection.c"
gboolean _tmp3_ = FALSE;
@@ -4569,109 +4569,109 @@ static DataView* view_collection_real_get_first_unrejected (ViewCollection* self
MediaSource* _tmp10_ = NULL;
gboolean _tmp11_ = FALSE;
MediaSource* _tmp12_ = NULL;
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = dv;
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp4_ != NULL) {
#line 4576 "ViewCollection.c"
DataView* _tmp5_ = NULL;
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = dv;
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject));
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = num_views;
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _tmp6_ < (_tmp7_ - 1);
#line 4588 "ViewCollection.c"
} else {
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = FALSE;
#line 4592 "ViewCollection.c"
}
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp3_) {
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 4598 "ViewCollection.c"
}
-#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = dv;
-#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = data_view_get_source (_tmp8_);
-#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp9_) : NULL;
-#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp10_ == NULL) {
-#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp9_);
#line 4610 "ViewCollection.c"
}
-#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 729 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
tmp = _tmp10_;
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = tmp;
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp12_ != NULL) {
#line 4618 "ViewCollection.c"
MediaSource* _tmp13_ = NULL;
Rating _tmp14_ = 0;
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = tmp;
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = media_source_get_rating (_tmp13_);
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = _tmp14_ != RATING_REJECTED;
#line 4627 "ViewCollection.c"
} else {
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = FALSE;
#line 4631 "ViewCollection.c"
}
-#line 730 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 731 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp11_) {
-#line 732 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = dv;
-#line 732 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (tmp);
-#line 732 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 733 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4641 "ViewCollection.c"
} else {
DataView* _tmp15_ = NULL;
DataView* _tmp16_ = NULL;
-#line 734 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = dv;
-#line 734 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = view_collection_get_next (self, _tmp15_);
-#line 734 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (dv);
-#line 734 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 735 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dv = _tmp16_;
#line 4653 "ViewCollection.c"
}
-#line 727 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 728 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (tmp);
#line 4657 "ViewCollection.c"
}
-#line 740 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = view_collection_get_first (self);
-#line 740 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp17_;
-#line 740 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (dv);
-#line 740 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 741 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4667 "ViewCollection.c"
}
DataView* view_collection_get_first_unrejected (ViewCollection* self) {
-#line 718 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 719 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 718 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 719 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_COLLECTION_GET_CLASS (self)->get_first_unrejected (self);
#line 4676 "ViewCollection.c"
}
@@ -4681,41 +4681,41 @@ static DataView* view_collection_real_get_last (ViewCollection* self) {
DataView* result = NULL;
DataView* _tmp0_ = NULL;
gint _tmp1_ = 0;
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ > 0) {
#line 4688 "ViewCollection.c"
gint _tmp2_ = 0;
DataObject* _tmp3_ = NULL;
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp2_ - 1);
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_VIEW, DataView);
#line 4699 "ViewCollection.c"
} else {
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp0_);
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = NULL;
#line 4705 "ViewCollection.c"
}
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
-#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 745 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4711 "ViewCollection.c"
}
DataView* view_collection_get_last (ViewCollection* self) {
-#line 743 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 743 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 744 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_COLLECTION_GET_CLASS (self)->get_last (self);
#line 4720 "ViewCollection.c"
}
@@ -4733,64 +4733,64 @@ static DataView* view_collection_real_get_next (ViewCollection* self, DataView*
gint _tmp6_ = 0;
gint _tmp7_ = 0;
DataObject* _tmp8_ = NULL;
-#line 747 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_DATA_VIEW (view), NULL);
#line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_DATA_VIEW (view), NULL);
+#line 749 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp0_ == 0) {
#line 749 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp0_ == 0) {
+#line 750 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = NULL;
-#line 749 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 750 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4746 "ViewCollection.c"
}
-#line 751 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view;
-#line 751 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 751 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- index = _tmp2_;
#line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ index = _tmp2_;
+#line 753 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = index;
-#line 752 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp3_ < 0) {
#line 753 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp3_ < 0) {
+#line 754 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = NULL;
-#line 753 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 754 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4762 "ViewCollection.c"
}
-#line 755 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = index;
-#line 755 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- index = _tmp4_ + 1;
#line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ index = _tmp4_ + 1;
+#line 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = index;
-#line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 756 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp5_ >= _tmp6_) {
#line 757 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp5_ >= _tmp6_) {
+#line 758 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
index = 0;
#line 4776 "ViewCollection.c"
}
-#line 759 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = index;
-#line 759 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_);
-#line 759 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView);
-#line 759 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 760 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4786 "ViewCollection.c"
}
DataView* view_collection_get_next (ViewCollection* self, DataView* view) {
-#line 747 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 747 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 748 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_COLLECTION_GET_CLASS (self)->get_next (self, view);
#line 4795 "ViewCollection.c"
}
@@ -4807,66 +4807,66 @@ static DataView* view_collection_real_get_previous (ViewCollection* self, DataVi
gint _tmp5_ = 0;
gint _tmp7_ = 0;
DataObject* _tmp8_ = NULL;
-#line 762 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_DATA_VIEW (view), NULL);
#line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_DATA_VIEW (view), NULL);
+#line 764 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp0_ == 0) {
#line 764 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp0_ == 0) {
+#line 765 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = NULL;
-#line 764 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 765 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4820 "ViewCollection.c"
}
-#line 766 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view;
-#line 766 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 766 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- index = _tmp2_;
#line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ index = _tmp2_;
+#line 768 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = index;
-#line 767 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp3_ < 0) {
#line 768 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp3_ < 0) {
+#line 769 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = NULL;
-#line 768 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 769 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4836 "ViewCollection.c"
}
-#line 770 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = index;
-#line 770 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- index = _tmp4_ - 1;
#line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ index = _tmp4_ - 1;
+#line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = index;
-#line 771 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_ < 0) {
#line 4846 "ViewCollection.c"
gint _tmp6_ = 0;
-#line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 773 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 772 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 773 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
index = _tmp6_ - 1;
#line 4852 "ViewCollection.c"
}
-#line 774 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = index;
-#line 774 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp7_);
-#line 774 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_VIEW, DataView);
-#line 774 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 775 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4862 "ViewCollection.c"
}
DataView* view_collection_get_previous (ViewCollection* self, DataView* view) {
-#line 762 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 762 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 763 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_COLLECTION_GET_CLASS (self)->get_previous (self, view);
#line 4871 "ViewCollection.c"
}
@@ -4886,63 +4886,63 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
DataView* prev_view = NULL;
DataView* _tmp19_ = NULL;
DataView* _tmp20_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 778 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 777 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 778 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_SOURCE (home), FALSE);
-#line 779 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 780 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_next);
-#line 779 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_next = NULL;
#line 780 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ _vala_next = NULL;
+#line 781 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_prev);
-#line 780 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 781 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_prev = NULL;
-#line 782 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = home;
-#line 782 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view_collection_get_view_for_source (self, _tmp0_);
-#line 782 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- home_view = _tmp1_;
#line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ home_view = _tmp1_;
+#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = home_view;
-#line 783 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp2_ == NULL) {
#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp2_ == NULL) {
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = FALSE;
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (home_view);
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (next) {
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*next = _vala_next;
#line 4919 "ViewCollection.c"
} else {
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_next);
#line 4923 "ViewCollection.c"
}
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (prev) {
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*prev = _vala_prev;
#line 4929 "ViewCollection.c"
} else {
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_prev);
#line 4933 "ViewCollection.c"
}
-#line 784 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 785 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 4937 "ViewCollection.c"
}
-#line 786 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = home_view;
-#line 786 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = view_collection_get_next (self, _tmp3_);
-#line 786 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- next_view = _tmp4_;
#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ next_view = _tmp4_;
+#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 4947 "ViewCollection.c"
DataView* _tmp5_ = NULL;
@@ -4951,21 +4951,21 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
const gchar* _tmp8_ = NULL;
DataView* _tmp17_ = NULL;
DataView* _tmp18_ = NULL;
-#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = next_view;
-#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = home_view;
-#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!(_tmp5_ != _tmp6_)) {
-#line 787 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 4962 "ViewCollection.c"
}
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = type_selector;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp8_ == NULL) {
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = TRUE;
#line 4970 "ViewCollection.c"
} else {
@@ -4975,60 +4975,60 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
gchar* _tmp12_ = NULL;
gchar* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = next_view;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = data_view_get_source (_tmp9_);
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = _tmp10_;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = data_source_get_typename (_tmp11_);
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = _tmp12_;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = type_selector;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = g_strcmp0 (_tmp13_, _tmp14_) == 0;
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_free0 (_tmp13_);
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp11_);
#line 4996 "ViewCollection.c"
}
-#line 788 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp7_) {
#line 5000 "ViewCollection.c"
DataView* _tmp15_ = NULL;
DataSource* _tmp16_ = NULL;
-#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = next_view;
-#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = data_view_get_source (_tmp15_);
-#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_next);
-#line 789 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_next = _tmp16_;
#line 790 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ _vala_next = _tmp16_;
+#line 791 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 5013 "ViewCollection.c"
}
-#line 792 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = next_view;
-#line 792 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp18_ = view_collection_get_next (self, _tmp17_);
-#line 792 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_view);
-#line 792 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 793 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
next_view = _tmp18_;
#line 5023 "ViewCollection.c"
}
-#line 795 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp19_ = home_view;
-#line 795 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp20_ = view_collection_get_previous (self, _tmp19_);
-#line 795 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- prev_view = _tmp20_;
#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ prev_view = _tmp20_;
+#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 5033 "ViewCollection.c"
DataView* _tmp21_ = NULL;
@@ -5037,21 +5037,21 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
const gchar* _tmp24_ = NULL;
DataView* _tmp33_ = NULL;
DataView* _tmp34_ = NULL;
-#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp21_ = prev_view;
-#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp22_ = home_view;
-#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!(_tmp21_ != _tmp22_)) {
-#line 796 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 5048 "ViewCollection.c"
}
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp24_ = type_selector;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp24_ == NULL) {
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp23_ = TRUE;
#line 5056 "ViewCollection.c"
} else {
@@ -5061,82 +5061,82 @@ gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSour
gchar* _tmp28_ = NULL;
gchar* _tmp29_ = NULL;
const gchar* _tmp30_ = NULL;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp25_ = prev_view;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp26_ = data_view_get_source (_tmp25_);
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp27_ = _tmp26_;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp28_ = data_source_get_typename (_tmp27_);
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp29_ = _tmp28_;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp30_ = type_selector;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp23_ = g_strcmp0 (_tmp29_, _tmp30_) == 0;
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_free0 (_tmp29_);
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp27_);
#line 5082 "ViewCollection.c"
}
-#line 797 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp23_) {
#line 5086 "ViewCollection.c"
DataView* _tmp31_ = NULL;
DataSource* _tmp32_ = NULL;
-#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp31_ = prev_view;
-#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp32_ = data_view_get_source (_tmp31_);
-#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_prev);
-#line 798 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_prev = _tmp32_;
#line 799 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ _vala_prev = _tmp32_;
+#line 800 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 5099 "ViewCollection.c"
}
-#line 801 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp33_ = prev_view;
-#line 801 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp34_ = view_collection_get_previous (self, _tmp33_);
-#line 801 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (prev_view);
-#line 801 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 802 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
prev_view = _tmp34_;
#line 5109 "ViewCollection.c"
}
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (prev_view);
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_view);
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (home_view);
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (next) {
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*next = _vala_next;
#line 5123 "ViewCollection.c"
} else {
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_next);
#line 5127 "ViewCollection.c"
}
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (prev) {
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*prev = _vala_prev;
#line 5133 "ViewCollection.c"
} else {
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_vala_prev);
#line 5137 "ViewCollection.c"
}
-#line 804 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 805 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 5141 "ViewCollection.c"
}
@@ -5157,43 +5157,43 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
DataSource* _tmp16_ = NULL;
GeeSet* _tmp26_ = NULL;
DataSource* _tmp27_ = NULL;
-#line 808 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 808 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 809 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_SOURCE (home), NULL);
-#line 810 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 811 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = gee_hash_set_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 810 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 811 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet);
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = home;
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = typename;
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = view_collection_get_immediate_neighbors (self, _tmp1_, &_tmp3_, &_tmp4_, _tmp2_);
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next);
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
next = _tmp3_;
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (prev);
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
prev = _tmp4_;
-#line 814 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp5_) {
#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (!_tmp5_) {
+#line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = neighbors;
-#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (prev);
-#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next);
-#line 815 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 816 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 5192 "ViewCollection.c"
}
-#line 818 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = next;
-#line 818 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp6_ != NULL) {
#line 5198 "ViewCollection.c"
GeeSet* _tmp7_ = NULL;
@@ -5205,50 +5205,50 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
DataSource* _tmp11_ = NULL;
DataSource* _tmp12_ = NULL;
DataSource* _tmp13_ = NULL;
-#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = neighbors;
-#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = next;
-#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 820 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp8_);
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = next;
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = typename;
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_get_immediate_neighbors (self, _tmp9_, &_tmp11_, &_tmp12_, _tmp10_);
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_next);
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
next_next = _tmp11_;
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_prev);
-#line 822 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 823 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
next_prev = _tmp12_;
-#line 825 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = next_next;
-#line 825 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp13_ != NULL) {
#line 5232 "ViewCollection.c"
GeeSet* _tmp14_ = NULL;
DataSource* _tmp15_ = NULL;
-#line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = neighbors;
-#line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = next_next;
-#line 826 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 827 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _tmp15_);
#line 5241 "ViewCollection.c"
}
-#line 818 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_prev);
-#line 818 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 819 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_next);
#line 5247 "ViewCollection.c"
}
-#line 830 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = prev;
-#line 830 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp16_ != NULL) {
#line 5253 "ViewCollection.c"
GeeSet* _tmp17_ = NULL;
@@ -5260,60 +5260,60 @@ GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource
DataSource* _tmp21_ = NULL;
DataSource* _tmp22_ = NULL;
DataSource* _tmp23_ = NULL;
-#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = neighbors;
-#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp18_ = prev;
-#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 832 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_);
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp19_ = prev;
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp20_ = typename;
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_get_immediate_neighbors (self, _tmp19_, &_tmp21_, &_tmp22_, _tmp20_);
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_prev);
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
next_prev = _tmp21_;
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (prev_prev);
-#line 834 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 835 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
prev_prev = _tmp22_;
-#line 837 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp23_ = prev_prev;
-#line 837 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp23_ != NULL) {
#line 5287 "ViewCollection.c"
GeeSet* _tmp24_ = NULL;
DataSource* _tmp25_ = NULL;
-#line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp24_ = neighbors;
-#line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp25_ = prev_prev;
-#line 838 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 839 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
#line 5296 "ViewCollection.c"
}
-#line 830 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (prev_prev);
-#line 830 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 831 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next_prev);
#line 5302 "ViewCollection.c"
}
-#line 842 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp26_ = neighbors;
-#line 842 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp27_ = home;
-#line 842 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 843 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_);
-#line 844 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = neighbors;
-#line 844 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (prev);
-#line 844 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (next);
-#line 844 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 845 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 5318 "ViewCollection.c"
}
@@ -5328,19 +5328,19 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
GeeCollection* _tmp12_ = NULL;
gboolean _tmp13_ = FALSE;
gboolean _tmp14_ = FALSE;
-#line 849 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 849 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_if_fail (GEE_IS_COLLECTION (views));
#line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_if_fail (GEE_IS_COLLECTION (views));
+#line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = views;
-#line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _tmp1_;
-#line 850 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp2_ == 0) {
#line 851 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp2_ == 0) {
+#line 852 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
#line 5345 "ViewCollection.c"
}
@@ -5348,13 +5348,13 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
GeeIterator* _view_it = NULL;
GeeCollection* _tmp3_ = NULL;
GeeIterator* _tmp4_ = NULL;
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = views;
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_it = _tmp4_;
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 5359 "ViewCollection.c"
GeeIterator* _tmp5_ = NULL;
@@ -5364,47 +5364,47 @@ static void view_collection_add_many_selected (ViewCollection* self, GeeCollecti
gpointer _tmp8_ = NULL;
DataView* _tmp9_ = NULL;
gboolean _tmp10_ = FALSE;
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _view_it;
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = gee_iterator_next (_tmp5_);
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp6_) {
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 5375 "ViewCollection.c"
}
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = _view_it;
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = gee_iterator_get (_tmp7_);
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp8_;
#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view = (DataView*) _tmp8_;
+#line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = view;
-#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = data_view_is_visible (_tmp9_);
-#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 855 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp10_, "view.is_visible()");
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 5391 "ViewCollection.c"
}
-#line 853 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 854 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_it);
#line 5395 "ViewCollection.c"
}
-#line 856 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = self->priv->selected;
-#line 856 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = views;
-#line 856 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = data_set_add_many (_tmp11_, _tmp12_);
-#line 856 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- added = _tmp13_;
#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ added = _tmp13_;
+#line 858 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = added;
-#line 857 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 858 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp14_, "added");
#line 5409 "ViewCollection.c"
}
@@ -5419,33 +5419,33 @@ static void view_collection_remove_many_selected (ViewCollection* self, GeeColle
GeeCollection* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
gboolean _tmp6_ = FALSE;
-#line 860 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 860 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_if_fail (GEE_IS_COLLECTION (views));
#line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_if_fail (GEE_IS_COLLECTION (views));
+#line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = views;
-#line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _tmp1_;
-#line 861 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp2_ == 0) {
#line 862 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp2_ == 0) {
+#line 863 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
#line 5436 "ViewCollection.c"
}
-#line 864 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = self->priv->selected;
-#line 864 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = views;
-#line 864 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = data_set_remove_many (_tmp3_, _tmp4_);
-#line 864 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- removed = _tmp5_;
#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ removed = _tmp5_;
+#line 866 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = removed;
-#line 865 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 866 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp6_, "removed");
#line 5450 "ViewCollection.c"
}
@@ -5454,7 +5454,7 @@ static void view_collection_remove_many_selected (ViewCollection* self, GeeColle
static gboolean _view_collection_select_item_marked_action (DataObject* object, GObject* user, gpointer self) {
gboolean result;
result = view_collection_select_item ((ViewCollection*) self, object, user);
-#line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 5459 "ViewCollection.c"
}
@@ -5468,42 +5468,42 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) {
GeeArrayList* _tmp3_ = NULL;
gint _tmp4_ = 0;
gint _tmp5_ = 0;
-#line 869 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 869 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_if_fail (IS_MARKER (marker));
#line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_if_fail (IS_MARKER (marker));
+#line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- selected = _tmp0_;
#line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ selected = _tmp0_;
+#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = marker;
-#line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = selected;
-#line 871 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 872 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject));
-#line 873 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = selected;
-#line 873 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 873 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _tmp4_;
-#line 873 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_ > 0) {
#line 5493 "ViewCollection.c"
GeeArrayList* _tmp6_ = NULL;
GeeArrayList* _tmp7_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = selected;
-#line 874 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
#line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 876 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = selected;
-#line 875 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 876 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), NULL);
#line 5504 "ViewCollection.c"
}
-#line 869 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 870 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (selected);
#line 5508 "ViewCollection.c"
}
@@ -5512,17 +5512,17 @@ void view_collection_select_marked (ViewCollection* self, Marker* marker) {
void view_collection_select_all (ViewCollection* self) {
Marker* marker = NULL;
Marker* _tmp0_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_if_fail (IS_VIEW_COLLECTION (self));
+#line 882 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- marker = _tmp0_;
#line 882 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- marker_mark_all (marker);
+ marker = _tmp0_;
#line 883 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ marker_mark_all (marker);
+#line 884 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_select_marked (self, marker);
-#line 880 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 881 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (marker);
#line 5527 "ViewCollection.c"
}
@@ -5538,81 +5538,81 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
DataView* _tmp9_ = NULL;
DataView* _tmp10_ = NULL;
gboolean _tmp11_ = FALSE;
-#line 886 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 886 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 886 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
#line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
+#line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = object;
-#line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 887 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp1_;
#line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view = _tmp1_;
+#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = view;
-#line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = data_view_is_selected (_tmp2_);
-#line 888 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp3_) {
#line 5559 "ViewCollection.c"
DataView* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
-#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = view;
-#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = data_view_is_visible (_tmp4_);
-#line 889 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_) {
#line 5568 "ViewCollection.c"
DataSet* _tmp6_ = NULL;
DataView* _tmp7_ = NULL;
gboolean _tmp8_ = FALSE;
-#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = self->priv->selected;
-#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = view;
-#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = data_set_contains (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject));
-#line 890 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 891 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp8_, "selected.contains(view)");
#line 5580 "ViewCollection.c"
}
-#line 892 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
-#line 892 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 892 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 893 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 5588 "ViewCollection.c"
}
-#line 895 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 896 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = view;
-#line 895 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 896 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_view_internal_set_selected (_tmp9_, TRUE);
-#line 899 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = view;
-#line 899 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = data_view_is_visible (_tmp10_);
-#line 899 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp11_) {
#line 5600 "ViewCollection.c"
GObject* _tmp12_ = NULL;
DataView* _tmp13_ = NULL;
-#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = user;
-#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = view;
-#line 900 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 901 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
#line 5609 "ViewCollection.c"
}
-#line 902 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
-#line 902 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 902 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 903 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 5617 "ViewCollection.c"
}
@@ -5621,7 +5621,7 @@ static gboolean view_collection_select_item (ViewCollection* self, DataObject* o
static gboolean _view_collection_unselect_item_marked_action (DataObject* object, GObject* user, gpointer self) {
gboolean result;
result = view_collection_unselect_item ((ViewCollection*) self, object, user);
-#line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 5626 "ViewCollection.c"
}
@@ -5635,42 +5635,42 @@ void view_collection_unselect_marked (ViewCollection* self, Marker* marker) {
GeeArrayList* _tmp3_ = NULL;
gint _tmp4_ = 0;
gint _tmp5_ = 0;
-#line 906 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 906 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_if_fail (IS_MARKER (marker));
#line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_if_fail (IS_MARKER (marker));
+#line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- unselected = _tmp0_;
#line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ unselected = _tmp0_;
+#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = marker;
-#line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = unselected;
-#line 908 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 909 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject));
-#line 910 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = unselected;
-#line 910 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 910 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _tmp4_;
-#line 910 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_ > 0) {
#line 5660 "ViewCollection.c"
GeeArrayList* _tmp6_ = NULL;
GeeArrayList* _tmp7_ = NULL;
-#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = unselected;
-#line 911 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
#line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 913 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = unselected;
-#line 912 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 913 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
#line 5671 "ViewCollection.c"
}
-#line 906 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 907 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (unselected);
#line 5675 "ViewCollection.c"
}
@@ -5685,37 +5685,37 @@ void view_collection_unselect_all (ViewCollection* self) {
GeeList* _tmp4_ = NULL;
GeeList* _tmp5_ = NULL;
Marker* _tmp6_ = NULL;
-#line 917 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_if_fail (IS_VIEW_COLLECTION (self));
#line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_if_fail (IS_VIEW_COLLECTION (self));
+#line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->selected;
-#line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = data_set_get_count (_tmp0_);
-#line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp1_ == 0) {
#line 919 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp1_ == 0) {
+#line 920 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return;
#line 5698 "ViewCollection.c"
}
-#line 921 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 921 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- marker = _tmp2_;
#line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ marker = _tmp2_;
+#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = marker;
-#line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = view_collection_get_selected (self);
-#line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _tmp4_;
-#line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
marker_mark_many (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 922 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 923 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp5_);
-#line 924 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 925 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = marker;
-#line 924 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 925 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_unselect_marked (self, _tmp6_);
-#line 917 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 918 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (marker);
#line 5720 "ViewCollection.c"
}
@@ -5725,13 +5725,13 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
Marker* marker = NULL;
Marker* _tmp0_ = NULL;
Marker* _tmp15_ = NULL;
-#line 928 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 928 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_if_fail (IS_DATA_VIEW (exception));
#line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_if_fail (IS_DATA_VIEW (exception));
+#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
marker = _tmp0_;
#line 5736 "ViewCollection.c"
{
@@ -5740,19 +5740,19 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
GeeCollection* _tmp2_ = NULL;
GeeIterator* _tmp3_ = NULL;
GeeIterator* _tmp4_ = NULL;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _tmp1_;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = _tmp3_;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp2_);
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_object_it = _tmp4_;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 5757 "ViewCollection.c"
GeeIterator* _tmp5_ = NULL;
@@ -5765,60 +5765,60 @@ void view_collection_unselect_all_but (ViewCollection* self, DataView* exception
DataView* _tmp10_ = NULL;
DataView* _tmp11_ = NULL;
DataView* _tmp12_ = NULL;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _object_it;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = gee_iterator_next (_tmp5_);
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp6_) {
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 5776 "ViewCollection.c"
}
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = _object_it;
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = gee_iterator_get (_tmp7_);
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = (DataObject*) _tmp8_;
#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ object = (DataObject*) _tmp8_;
+#line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = object;
-#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_VIEW, DataView));
-#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp10_;
#line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view = _tmp10_;
+#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = view;
-#line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = exception;
-#line 932 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp11_ != _tmp12_) {
#line 5796 "ViewCollection.c"
Marker* _tmp13_ = NULL;
DataView* _tmp14_ = NULL;
-#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = marker;
-#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = view;
-#line 933 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 934 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
marker_mark (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
#line 5805 "ViewCollection.c"
}
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
#line 5811 "ViewCollection.c"
}
-#line 930 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 931 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
#line 5815 "ViewCollection.c"
}
-#line 936 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 937 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = marker;
-#line 936 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 937 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_unselect_marked (self, _tmp15_);
-#line 928 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 929 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (marker);
#line 5823 "ViewCollection.c"
}
@@ -5834,59 +5834,59 @@ static gboolean view_collection_unselect_item (ViewCollection* self, DataObject*
DataView* _tmp7_ = NULL;
GObject* _tmp8_ = NULL;
DataView* _tmp9_ = NULL;
-#line 939 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 939 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 939 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
#line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
+#line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = object;
-#line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 940 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp1_;
#line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view = _tmp1_;
+#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = view;
-#line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = data_view_is_selected (_tmp2_);
-#line 941 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp3_) {
#line 5855 "ViewCollection.c"
DataSet* _tmp4_ = NULL;
DataView* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
-#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = self->priv->selected;
-#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = view;
-#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = data_set_contains (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject));
-#line 942 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 943 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (!_tmp6_, "!selected.contains(view)");
-#line 944 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
-#line 944 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 944 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 945 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 5873 "ViewCollection.c"
}
-#line 947 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = view;
-#line 947 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_view_internal_set_selected (_tmp7_, FALSE);
#line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ data_view_internal_set_selected (_tmp7_, FALSE);
+#line 949 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = user;
-#line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 949 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = view;
-#line 948 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 949 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ARRAY_LIST, GeeArrayList), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_);
-#line 950 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
-#line 950 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 950 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 951 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 5891 "ViewCollection.c"
}
@@ -5899,37 +5899,37 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u
GeeArrayList* selected = NULL;
GeeArrayList* _tmp2_ = NULL;
Marker* _tmp3_ = NULL;
-#line 954 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 954 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_MARKER (unselect));
-#line 954 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_if_fail (IS_MARKER (select));
#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_if_fail (IS_MARKER (select));
+#line 956 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- unselected = _tmp0_;
#line 956 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ unselected = _tmp0_;
+#line 957 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = unselect;
-#line 956 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 957 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_unselect_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (unselected, G_TYPE_OBJECT, GObject));
-#line 958 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 959 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (unselected, GEE_TYPE_COLLECTION, GeeCollection));
-#line 960 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 960 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- selected = _tmp2_;
#line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ selected = _tmp2_;
+#line 962 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = select;
-#line 961 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 962 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp3_, _view_collection_select_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (selected, G_TYPE_OBJECT, GObject));
-#line 963 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 964 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (selected, GEE_TYPE_COLLECTION, GeeCollection));
-#line 965 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 966 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (selected, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (unselected, GEE_TYPE_COLLECTION, GeeCollection));
-#line 954 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (selected);
-#line 954 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 955 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (unselected);
#line 5934 "ViewCollection.c"
}
@@ -5938,7 +5938,7 @@ void view_collection_unselect_and_select_marked (ViewCollection* self, Marker* u
static gboolean _view_collection_toggle_item_marked_action (DataObject* object, GObject* user, gpointer self) {
gboolean result;
result = view_collection_toggle_item ((ViewCollection*) self, object, user);
-#line 972 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 5943 "ViewCollection.c"
}
@@ -5952,33 +5952,33 @@ void view_collection_toggle_marked (ViewCollection* self, Marker* marker) {
GeeArrayList* _tmp3_ = NULL;
GeeArrayList* _tmp4_ = NULL;
GeeArrayList* _tmp5_ = NULL;
-#line 970 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 970 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_if_fail (IS_MARKER (marker));
#line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_if_fail (IS_MARKER (marker));
+#line 972 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = view_collection_toggle_lists_new ();
-#line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- lists = _tmp0_;
#line 972 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ lists = _tmp0_;
+#line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = marker;
-#line 972 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 973 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_collection_act_on_marked (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), _tmp1_, _view_collection_toggle_item_marked_action, self, NULL, NULL, G_TYPE_CHECK_INSTANCE_CAST (lists, G_TYPE_OBJECT, GObject));
-#line 975 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 976 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = lists->selected;
-#line 975 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
#line 976 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 977 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = lists->unselected;
-#line 976 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 977 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 978 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = lists->selected;
-#line 978 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = lists->unselected;
-#line 978 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 979 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_items_selected_unselected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 970 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 971 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (lists);
#line 5983 "ViewCollection.c"
}
@@ -5994,50 +5994,50 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o
ViewCollectionToggleLists* _tmp3_ = NULL;
DataView* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
-#line 981 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 981 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 981 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
#line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail ((user == NULL) || G_IS_OBJECT (user), FALSE);
+#line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = object;
-#line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView));
-#line 982 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = _tmp1_;
#line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view = _tmp1_;
+#line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = user;
-#line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, VIEW_COLLECTION_TYPE_TOGGLE_LISTS, ViewCollectionToggleLists));
-#line 983 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 984 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
lists = _tmp3_;
-#line 989 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = view;
-#line 989 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = data_view_internal_toggle (_tmp4_);
-#line 989 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_) {
#line 6021 "ViewCollection.c"
DataView* _tmp6_ = NULL;
gboolean _tmp7_ = FALSE;
-#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = view;
-#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = data_view_is_visible (_tmp6_);
-#line 990 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp7_) {
#line 6030 "ViewCollection.c"
ViewCollectionToggleLists* _tmp8_ = NULL;
GeeArrayList* _tmp9_ = NULL;
DataView* _tmp10_ = NULL;
-#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = lists;
-#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = _tmp8_->selected;
-#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = view;
-#line 991 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 992 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
#line 6042 "ViewCollection.c"
}
@@ -6045,23 +6045,23 @@ static gboolean view_collection_toggle_item (ViewCollection* self, DataObject* o
ViewCollectionToggleLists* _tmp11_ = NULL;
GeeArrayList* _tmp12_ = NULL;
DataView* _tmp13_ = NULL;
-#line 993 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = lists;
-#line 993 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = _tmp11_->unselected;
-#line 993 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = view;
-#line 993 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 994 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
#line 6056 "ViewCollection.c"
}
-#line 996 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
-#line 996 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (lists);
-#line 996 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 996 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 997 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6066 "ViewCollection.c"
}
@@ -6071,15 +6071,15 @@ gint view_collection_get_selected_count (ViewCollection* self) {
gint result = 0;
DataSet* _tmp0_ = NULL;
gint _tmp1_ = 0;
-#line 999 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
#line 1000 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
+#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->selected;
-#line 1000 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = data_set_get_count (_tmp0_);
-#line 1000 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp1_;
-#line 1000 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1001 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6084 "ViewCollection.c"
}
@@ -6089,15 +6089,15 @@ GeeList* view_collection_get_selected (ViewCollection* self) {
GeeList* result = NULL;
DataSet* _tmp0_ = NULL;
GeeList* _tmp1_ = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1004 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->selected;
-#line 1004 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = data_set_get_all (_tmp0_);
-#line 1004 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_LIST, GeeList);
-#line 1004 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1005 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6102 "ViewCollection.c"
}
@@ -6108,17 +6108,17 @@ DataView* view_collection_get_selected_at (ViewCollection* self, gint index) {
DataSet* _tmp0_ = NULL;
gint _tmp1_ = 0;
DataObject* _tmp2_ = NULL;
-#line 1007 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1008 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->selected;
-#line 1008 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = index;
-#line 1008 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = data_set_get_at (_tmp0_, _tmp1_);
-#line 1008 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
-#line 1008 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1009 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6123 "ViewCollection.c"
}
@@ -6128,35 +6128,35 @@ static gboolean view_collection_is_visible (ViewCollection* self, DataView* view
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
DataSet* _tmp1_ = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 1011 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->visible;
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp1_ != NULL) {
#line 6139 "ViewCollection.c"
DataSet* _tmp2_ = NULL;
DataView* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->visible;
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = view;
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = data_set_contains (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = _tmp4_;
#line 6151 "ViewCollection.c"
} else {
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = TRUE;
#line 6155 "ViewCollection.c"
}
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_;
-#line 1012 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1013 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6161 "ViewCollection.c"
}
@@ -6171,51 +6171,51 @@ static gboolean view_collection_add_many_visible (ViewCollection* self, GeeColle
DataSet* _tmp4_ = NULL;
gint _tmp5_ = 0;
gint _tmp6_ = 0;
-#line 1015 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 1015 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (GEE_IS_COLLECTION (many), FALSE);
#line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (GEE_IS_COLLECTION (many), FALSE);
+#line 1017 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->visible;
-#line 1016 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp0_ == NULL) {
#line 1017 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp0_ == NULL) {
+#line 1018 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
-#line 1017 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1018 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6186 "ViewCollection.c"
}
-#line 1019 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->visible;
-#line 1019 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = many;
-#line 1019 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = data_set_add_many (_tmp1_, _tmp2_);
-#line 1019 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (!_tmp3_) {
#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (!_tmp3_) {
+#line 1021 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = FALSE;
-#line 1020 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1021 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6200 "ViewCollection.c"
}
-#line 1023 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = self->priv->visible;
-#line 1023 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = data_set_get_count (_tmp4_);
-#line 1023 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1023 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp5_ == _tmp6_) {
#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp5_ == _tmp6_) {
+#line 1025 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_data_set_unref0 (self->priv->visible);
-#line 1024 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1025 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->visible = NULL;
#line 6214 "ViewCollection.c"
}
-#line 1026 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1027 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
-#line 1026 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1027 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6220 "ViewCollection.c"
}
@@ -6241,33 +6241,33 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
GeeList* _tmp33_ = NULL;
gint _tmp34_ = 0;
gint _tmp35_ = 0;
-#line 1030 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 1030 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_if_fail (GEE_IS_LIST (to_hide));
#line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_if_fail (GEE_IS_LIST (to_hide));
+#line 1032 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1032 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
unselected = _tmp0_;
-#line 1033 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = to_hide;
-#line 1033 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1033 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _tmp2_;
-#line 1033 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
count = _tmp3_;
#line 6260 "ViewCollection.c"
{
gint ctr = 0;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = 0;
#line 6265 "ViewCollection.c"
{
gboolean _tmp4_ = FALSE;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = TRUE;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 6272 "ViewCollection.c"
gint _tmp6_ = 0;
@@ -6281,155 +6281,155 @@ static void view_collection_hide_items (ViewCollection* self, GeeList* to_hide)
DataView* _tmp13_ = NULL;
gboolean _tmp14_ = FALSE;
DataView* _tmp21_ = NULL;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp4_) {
#line 6286 "ViewCollection.c"
gint _tmp5_ = 0;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = ctr;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = _tmp5_ + 1;
#line 6292 "ViewCollection.c"
}
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = FALSE;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = ctr;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = count;
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!(_tmp6_ < _tmp7_)) {
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 6304 "ViewCollection.c"
}
-#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = to_hide;
-#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = ctr;
-#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = gee_list_get (_tmp8_, _tmp9_);
-#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp10_;
#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view = (DataView*) _tmp10_;
+#line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = view;
-#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = data_view_is_visible (_tmp11_);
-#line 1036 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1037 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp12_, "view.is_visible()");
-#line 1038 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = view;
-#line 1038 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = data_view_is_selected (_tmp13_);
-#line 1038 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp14_) {
#line 6326 "ViewCollection.c"
DataView* _tmp15_ = NULL;
GeeArrayList* _tmp16_ = NULL;
DataView* _tmp17_ = NULL;
-#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = view;
-#line 1039 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- data_view_internal_set_selected (_tmp15_, FALSE);
#line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ data_view_internal_set_selected (_tmp15_, FALSE);
+#line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = unselected;
-#line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = view;
-#line 1040 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1041 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
#line 6340 "ViewCollection.c"
} else {
DataSet* _tmp18_ = NULL;
DataView* _tmp19_ = NULL;
gboolean _tmp20_ = FALSE;
-#line 1042 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp18_ = self->priv->selected;
-#line 1042 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp19_ = view;
-#line 1042 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp20_ = data_set_contains (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_OBJECT, DataObject));
-#line 1042 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1043 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (!_tmp20_, "!selected.contains(view)");
#line 6353 "ViewCollection.c"
}
-#line 1045 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1046 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp21_ = view;
-#line 1045 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1046 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_view_internal_set_visible (_tmp21_, FALSE);
-#line 1034 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1035 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 6361 "ViewCollection.c"
}
}
}
-#line 1048 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1049 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp22_ = self->priv->visible;
-#line 1048 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1049 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp22_ == NULL) {
#line 6369 "ViewCollection.c"
DataSet* _tmp23_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp23_ = data_collection_get_dataset_copy (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1050 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_data_set_unref0 (self->priv->visible);
-#line 1050 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1051 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->visible = _tmp23_;
#line 6377 "ViewCollection.c"
}
-#line 1053 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp24_ = self->priv->visible;
-#line 1053 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp25_ = to_hide;
-#line 1053 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp26_ = data_set_remove_many (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1053 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- removed = _tmp26_;
#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ removed = _tmp26_;
+#line 1055 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp27_ = removed;
-#line 1054 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1055 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp27_, "removed");
-#line 1056 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1057 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp28_ = unselected;
-#line 1056 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1057 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_remove_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1058 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp29_ = unselected;
-#line 1058 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1058 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp31_ = _tmp30_;
-#line 1058 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp31_ > 0) {
#line 6403 "ViewCollection.c"
GeeArrayList* _tmp32_ = NULL;
-#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1060 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp32_ = unselected;
-#line 1059 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1060 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_items_selected_unselected (self, NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection));
#line 6409 "ViewCollection.c"
}
-#line 1061 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp33_ = to_hide;
-#line 1061 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1061 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp35_ = _tmp34_;
-#line 1061 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp35_ > 0) {
#line 6419 "ViewCollection.c"
GeeList* _tmp36_ = NULL;
GeeList* _tmp37_ = NULL;
-#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp36_ = to_hide;
-#line 1062 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_items_hidden (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view_collection_notify_items_hidden (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1064 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp37_ = to_hide;
-#line 1063 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1064 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection));
#line 6430 "ViewCollection.c"
}
-#line 1030 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1031 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (unselected);
#line 6434 "ViewCollection.c"
}
@@ -6450,33 +6450,33 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
GeeList* _tmp25_ = NULL;
gint _tmp26_ = 0;
gint _tmp27_ = 0;
-#line 1068 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 1068 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_if_fail (GEE_IS_LIST (to_show));
#line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_if_fail (GEE_IS_LIST (to_show));
+#line 1070 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1070 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
added_selected = _tmp0_;
-#line 1071 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = to_show;
-#line 1071 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1071 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _tmp2_;
-#line 1071 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
count = _tmp3_;
#line 6469 "ViewCollection.c"
{
gint ctr = 0;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = 0;
#line 6474 "ViewCollection.c"
{
gboolean _tmp4_ = FALSE;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = TRUE;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 6481 "ViewCollection.c"
gint _tmp6_ = 0;
@@ -6490,51 +6490,51 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
DataView* _tmp13_ = NULL;
DataView* _tmp14_ = NULL;
gboolean _tmp15_ = FALSE;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp4_) {
#line 6495 "ViewCollection.c"
gint _tmp5_ = 0;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = ctr;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = _tmp5_ + 1;
#line 6501 "ViewCollection.c"
}
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = FALSE;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = ctr;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = count;
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!(_tmp6_ < _tmp7_)) {
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 6513 "ViewCollection.c"
}
-#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = to_show;
-#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = ctr;
-#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = gee_list_get (_tmp8_, _tmp9_);
-#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp10_;
#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view = (DataView*) _tmp10_;
+#line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = view;
-#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = data_view_is_visible (_tmp11_);
-#line 1074 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1075 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (!_tmp12_, "!view.is_visible()");
-#line 1076 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1077 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = view;
-#line 1076 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1077 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
data_view_internal_set_visible (_tmp13_, TRUE);
-#line 1079 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = view;
-#line 1079 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = data_view_is_selected (_tmp14_);
-#line 1079 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp15_) {
#line 6539 "ViewCollection.c"
DataSet* _tmp16_ = NULL;
@@ -6542,64 +6542,64 @@ static void view_collection_show_items (ViewCollection* self, GeeList* to_show)
gboolean _tmp18_ = FALSE;
GeeArrayList* _tmp19_ = NULL;
DataView* _tmp20_ = NULL;
-#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = self->priv->selected;
-#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = view;
-#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp18_ = data_set_contains (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject));
-#line 1080 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- _vala_assert (!_tmp18_, "!selected.contains(view)");
#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ _vala_assert (!_tmp18_, "!selected.contains(view)");
+#line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp19_ = added_selected;
-#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp20_ = view;
-#line 1081 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1082 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_);
#line 6559 "ViewCollection.c"
}
-#line 1072 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1073 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 6563 "ViewCollection.c"
}
}
}
-#line 1085 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp21_ = to_show;
-#line 1085 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp22_ = view_collection_add_many_visible (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1085 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- added = _tmp22_;
#line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ added = _tmp22_;
+#line 1087 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp23_ = added;
-#line 1086 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1087 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp23_, "added");
-#line 1088 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1089 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp24_ = added_selected;
-#line 1088 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1089 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_add_many_selected (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1090 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp25_ = to_show;
-#line 1090 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1090 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp27_ = _tmp26_;
-#line 1090 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp27_ > 0) {
#line 6589 "ViewCollection.c"
GeeList* _tmp28_ = NULL;
GeeList* _tmp29_ = NULL;
-#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp28_ = to_show;
-#line 1091 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_items_shown (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view_collection_notify_items_shown (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1093 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp29_ = to_show;
-#line 1092 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1093 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_items_visibility_changed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
#line 6600 "ViewCollection.c"
}
-#line 1068 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1069 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (added_selected);
#line 6604 "ViewCollection.c"
}
@@ -6611,23 +6611,23 @@ gboolean view_collection_has_view_for_source (ViewCollection* self, DataSource*
DataView* _tmp1_ = NULL;
DataView* _tmp2_ = NULL;
gboolean _tmp3_ = FALSE;
-#line 1097 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 1097 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = source;
-#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view_collection_get_view_for_source (self, _tmp0_);
-#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _tmp1_;
-#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _tmp2_ != NULL;
-#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp2_);
-#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp3_;
-#line 1098 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1099 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6632 "ViewCollection.c"
}
@@ -6638,19 +6638,19 @@ DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource*
GeeHashMap* _tmp0_ = NULL;
DataSource* _tmp1_ = NULL;
gpointer _tmp2_ = NULL;
-#line 1102 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 1102 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
#line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
+#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->source_map;
-#line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = source;
-#line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = (DataView*) _tmp2_;
-#line 1103 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1104 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6655 "ViewCollection.c"
}
@@ -6662,23 +6662,23 @@ gboolean view_collection_has_view_for_source_with_filtered (ViewCollection* self
DataView* _tmp1_ = NULL;
DataView* _tmp2_ = NULL;
gboolean _tmp3_ = FALSE;
-#line 1107 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
-#line 1107 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = source;
-#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view_collection_get_view_for_source_filtered (self, _tmp0_);
-#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _tmp1_;
-#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _tmp2_ != NULL;
-#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp2_);
-#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp3_;
-#line 1108 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1109 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6683 "ViewCollection.c"
}
@@ -6692,50 +6692,50 @@ DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, Da
gpointer _tmp2_ = NULL;
gboolean _tmp3_ = FALSE;
DataView* _tmp4_ = NULL;
-#line 1112 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
-#line 1112 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
#line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
+#line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->source_map;
-#line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = source;
-#line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 1113 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1114 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view = (DataView*) _tmp2_;
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = view;
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp4_ != NULL) {
#line 6711 "ViewCollection.c"
DataView* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = view;
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = view_collection_is_in_filter (self, _tmp5_);
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = !_tmp6_;
#line 6720 "ViewCollection.c"
} else {
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = FALSE;
#line 6724 "ViewCollection.c"
}
-#line 1115 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp3_) {
#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp3_) {
+#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = NULL;
-#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 1116 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6734 "ViewCollection.c"
}
-#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1118 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = view;
-#line 1117 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1118 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6740 "ViewCollection.c"
}
@@ -6750,27 +6750,27 @@ GeeCollection* view_collection_get_sources (ViewCollection* self) {
GeeSet* _tmp4_ = NULL;
GeeSet* _tmp5_ = NULL;
GeeCollection* _tmp6_ = NULL;
-#line 1121 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->source_map;
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _tmp1_;
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _tmp2_;
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = gee_set_get_read_only_view (_tmp3_);
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _tmp4_;
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp3_);
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp6_;
-#line 1122 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1123 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6775 "ViewCollection.c"
}
@@ -6780,13 +6780,13 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
gboolean result = FALSE;
GType _tmp0_ = 0UL;
gboolean _tmp1_ = FALSE;
-#line 1126 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 1127 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
+#line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = t;
-#line 1127 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE);
-#line 1127 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1128 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
#line 6791 "ViewCollection.c"
{
@@ -6797,23 +6797,23 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
GeeSet* _tmp5_ = NULL;
GeeIterator* _tmp6_ = NULL;
GeeIterator* _tmp7_ = NULL;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = self->priv->source_map;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = _tmp3_;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _tmp4_;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = _tmp6_;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp5_);
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_source_it = _tmp7_;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 6818 "ViewCollection.c"
GeeIterator* _tmp8_ = NULL;
@@ -6825,53 +6825,53 @@ gboolean view_collection_has_source_of_type (ViewCollection* self, GType t) {
GType _tmp13_ = 0UL;
GType _tmp14_ = 0UL;
gboolean _tmp15_ = FALSE;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = _source_it;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = gee_iterator_next (_tmp8_);
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp9_) {
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 6836 "ViewCollection.c"
}
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = _source_it;
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = gee_iterator_get (_tmp10_);
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- source = (DataSource*) _tmp11_;
#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ source = (DataSource*) _tmp11_;
+#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = source;
-#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject));
-#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = t;
-#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
-#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- if (_tmp15_) {
#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ if (_tmp15_) {
+#line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
-#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (source);
-#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_source_it);
-#line 1131 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1132 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6862 "ViewCollection.c"
}
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (source);
#line 6866 "ViewCollection.c"
}
-#line 1129 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1130 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_source_it);
#line 6870 "ViewCollection.c"
}
-#line 1134 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = FALSE;
-#line 1134 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1135 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6876 "ViewCollection.c"
}
@@ -6882,15 +6882,15 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
GType _tmp0_ = 0UL;
gboolean _tmp1_ = FALSE;
gint count = 0;
-#line 1137 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
#line 1138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
+#line 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = t;
-#line 1138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE);
-#line 1138 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1139 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
-#line 1140 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
count = 0;
#line 6895 "ViewCollection.c"
{
@@ -6899,19 +6899,19 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
GeeCollection* _tmp3_ = NULL;
GeeIterator* _tmp4_ = NULL;
GeeIterator* _tmp5_ = NULL;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _tmp2_;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _tmp4_;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp3_);
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_object_it = _tmp5_;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 6916 "ViewCollection.c"
GeeIterator* _tmp6_ = NULL;
@@ -6926,59 +6926,59 @@ gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t) {
GType _tmp14_ = 0UL;
gboolean _tmp15_ = FALSE;
gboolean _tmp16_ = FALSE;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = _object_it;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp7_) {
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 6937 "ViewCollection.c"
}
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = _object_it;
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = (DataObject*) _tmp9_;
#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ object = (DataObject*) _tmp9_;
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = object;
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = _tmp11_;
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject));
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = t;
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = _tmp15_;
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp12_);
-#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp16_) {
#line 6963 "ViewCollection.c"
gint _tmp17_ = 0;
-#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = count;
-#line 1143 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1144 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
count = _tmp17_ + 1;
#line 6969 "ViewCollection.c"
}
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
#line 6973 "ViewCollection.c"
}
-#line 1141 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1142 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
#line 6977 "ViewCollection.c"
}
-#line 1146 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1147 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = count;
-#line 1146 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1147 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 6983 "ViewCollection.c"
}
@@ -6989,15 +6989,15 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
GType _tmp0_ = 0UL;
gboolean _tmp1_ = FALSE;
GeeList* sources = NULL;
-#line 1149 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = t;
-#line 1150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = g_type_is_a (_tmp0_, TYPE_DATA_SOURCE);
-#line 1150 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1151 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_vala_assert (_tmp1_, "t.is_a(typeof(DataSource))");
-#line 1152 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
sources = NULL;
#line 7002 "ViewCollection.c"
{
@@ -7006,19 +7006,19 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
GeeCollection* _tmp3_ = NULL;
GeeIterator* _tmp4_ = NULL;
GeeIterator* _tmp5_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _tmp2_;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _tmp4_;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp3_);
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_object_it = _tmp5_;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 7023 "ViewCollection.c"
GeeIterator* _tmp6_ = NULL;
@@ -7033,77 +7033,77 @@ GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t) {
GType _tmp13_ = 0UL;
GType _tmp14_ = 0UL;
gboolean _tmp15_ = FALSE;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = _object_it;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp7_) {
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 7044 "ViewCollection.c"
}
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = _object_it;
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- object = (DataObject*) _tmp9_;
#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ object = (DataObject*) _tmp9_;
+#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = object;
-#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
-#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- source = _tmp11_;
#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ source = _tmp11_;
+#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = source;
-#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject));
-#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = t;
-#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
-#line 1155 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp15_) {
#line 7068 "ViewCollection.c"
GeeList* _tmp16_ = NULL;
GeeList* _tmp18_ = NULL;
DataSource* _tmp19_ = NULL;
-#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = sources;
-#line 1156 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp16_ == NULL) {
#line 7076 "ViewCollection.c"
GeeArrayList* _tmp17_ = NULL;
-#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (sources);
-#line 1157 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1158 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList);
#line 7084 "ViewCollection.c"
}
-#line 1159 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp18_ = sources;
-#line 1159 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp19_ = source;
-#line 1159 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1160 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
#line 7092 "ViewCollection.c"
}
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (source);
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
#line 7098 "ViewCollection.c"
}
-#line 1153 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1154 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_object_it);
#line 7102 "ViewCollection.c"
}
-#line 1163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = sources;
-#line 1163 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1164 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 7108 "ViewCollection.c"
}
@@ -7116,29 +7116,29 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
gint count = 0;
DataSet* _tmp1_ = NULL;
gint _tmp2_ = 0;
-#line 1166 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1167 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1168 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 1169 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->selected;
-#line 1169 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = data_set_get_count (_tmp1_);
-#line 1169 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
count = _tmp2_;
#line 7131 "ViewCollection.c"
{
gint ctr = 0;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = 0;
#line 7136 "ViewCollection.c"
{
gboolean _tmp3_ = FALSE;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = TRUE;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 7143 "ViewCollection.c"
gint _tmp5_ = 0;
@@ -7150,55 +7150,55 @@ GeeList* view_collection_get_selected_sources (ViewCollection* self) {
DataView* _tmp11_ = NULL;
DataSource* _tmp12_ = NULL;
DataSource* _tmp13_ = NULL;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp3_) {
#line 7155 "ViewCollection.c"
gint _tmp4_ = 0;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = ctr;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
ctr = _tmp4_ + 1;
#line 7161 "ViewCollection.c"
}
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = FALSE;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = ctr;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = count;
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!(_tmp5_ < _tmp6_)) {
-#line 1170 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 7173 "ViewCollection.c"
}
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = sources;
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = self->priv->selected;
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = ctr;
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = data_set_get_at (_tmp8_, _tmp9_);
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView);
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = data_view_get_source (_tmp11_);
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = _tmp12_;
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), _tmp13_);
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp13_);
-#line 1171 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1172 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp11_);
#line 7195 "ViewCollection.c"
}
}
}
-#line 1173 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1174 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = sources;
-#line 1173 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1174 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 7203 "ViewCollection.c"
}
@@ -7212,44 +7212,44 @@ DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint i
DataObject* _tmp2_ = NULL;
DataSource* _tmp3_ = NULL;
DataObject* _tmp4_ = NULL;
-#line 1176 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1177 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->selected;
-#line 1177 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = index;
-#line 1177 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = data_set_get_at (_tmp0_, _tmp1_);
-#line 1177 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1178 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
object = _tmp2_;
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = object;
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp4_ != NULL) {
#line 7229 "ViewCollection.c"
DataObject* _tmp5_ = NULL;
DataSource* _tmp6_ = NULL;
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = object;
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_VIEW, DataView));
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp3_);
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _tmp6_;
#line 7240 "ViewCollection.c"
} else {
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp3_);
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = NULL;
#line 7246 "ViewCollection.c"
}
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp3_;
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (object);
-#line 1179 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1180 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 7254 "ViewCollection.c"
}
@@ -7258,9 +7258,9 @@ DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint i
GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t) {
GeeList* result = NULL;
GeeList* sources = NULL;
-#line 1182 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
#line 1183 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (self), NULL);
+#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
sources = NULL;
#line 7265 "ViewCollection.c"
{
@@ -7271,21 +7271,21 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
gint _tmp2_ = 0;
gint _tmp3_ = 0;
gint _view_index = 0;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = view_collection_get_selected (self);
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_list = _tmp0_;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = _view_list;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _tmp2_;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_size = _tmp3_;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_index = -1;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 7290 "ViewCollection.c"
gint _tmp4_ = 0;
@@ -7302,83 +7302,83 @@ GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GTy
GType _tmp13_ = 0UL;
GType _tmp14_ = 0UL;
gboolean _tmp15_ = FALSE;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = _view_index;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_index = _tmp4_ + 1;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _view_index;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = _view_size;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!(_tmp5_ < _tmp6_)) {
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 7317 "ViewCollection.c"
}
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = _view_list;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = _view_index;
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = gee_list_get (_tmp7_, _tmp8_);
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp9_;
#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view = (DataView*) _tmp9_;
+#line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = view;
-#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = data_view_get_source (_tmp10_);
-#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- source = _tmp11_;
#line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ source = _tmp11_;
+#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = source;
-#line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = G_TYPE_FROM_INSTANCE (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject));
-#line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = t;
-#line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = g_type_is_a (_tmp13_, _tmp14_);
-#line 1186 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp15_) {
#line 7343 "ViewCollection.c"
GeeList* _tmp16_ = NULL;
GeeList* _tmp18_ = NULL;
DataSource* _tmp19_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = sources;
-#line 1187 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp16_ == NULL) {
#line 7351 "ViewCollection.c"
GeeArrayList* _tmp17_ = NULL;
-#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = gee_array_list_new (TYPE_DATA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (sources);
-#line 1188 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1189 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
sources = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_LIST, GeeList);
#line 7359 "ViewCollection.c"
}
-#line 1190 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp18_ = sources;
-#line 1190 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp19_ = source;
-#line 1190 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1191 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
#line 7367 "ViewCollection.c"
}
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (source);
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 7373 "ViewCollection.c"
}
-#line 1184 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1185 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_list);
#line 7377 "ViewCollection.c"
}
-#line 1194 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = sources;
-#line 1194 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1195 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 7383 "ViewCollection.c"
}
@@ -7391,40 +7391,40 @@ gint view_collection_index_of_source (ViewCollection* self, DataSource* source)
DataView* _tmp1_ = NULL;
gint _tmp2_ = 0;
DataView* _tmp3_ = NULL;
-#line 1198 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_COLLECTION (self), 0);
-#line 1198 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_DATA_SOURCE (source), 0);
#line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_DATA_SOURCE (source), 0);
+#line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = source;
-#line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view_collection_get_view_for_source (self, _tmp0_);
-#line 1199 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1200 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view = _tmp1_;
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = view;
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp3_ != NULL) {
#line 7408 "ViewCollection.c"
DataView* _tmp4_ = NULL;
gint _tmp5_ = 0;
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = view;
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = data_collection_index_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = _tmp5_;
#line 7417 "ViewCollection.c"
} else {
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = -1;
#line 7421 "ViewCollection.c"
}
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp2_;
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
-#line 1201 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1202 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 7429 "ViewCollection.c"
}
@@ -7432,57 +7432,57 @@ gint view_collection_index_of_source (ViewCollection* self, DataSource* source)
void view_collection_internal_notify_view_altered (ViewCollection* self, DataView* view) {
gboolean _tmp0_ = FALSE;
-#line 1205 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1206 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 1205 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_if_fail (IS_DATA_VIEW (view));
#line 1206 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_if_fail (IS_DATA_VIEW (view));
+#line 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1206 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp0_) {
#line 7443 "ViewCollection.c"
DataView* _tmp1_ = NULL;
DataView* _tmp2_ = NULL;
GeeCollection* _tmp3_ = NULL;
GeeCollection* _tmp4_ = NULL;
-#line 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view;
-#line 1207 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_item_view_altered (self, _tmp1_);
#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view_collection_notify_item_view_altered (self, _tmp1_);
+#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = view;
-#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_views_altered (self, _tmp4_);
-#line 1208 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1209 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp4_);
#line 7462 "ViewCollection.c"
} else {
GeeHashSet* _tmp5_ = NULL;
GeeHashSet* _tmp7_ = NULL;
DataView* _tmp8_ = NULL;
-#line 1210 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = self->priv->frozen_views_altered;
-#line 1210 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_ == NULL) {
#line 7471 "ViewCollection.c"
GeeHashSet* _tmp6_ = NULL;
-#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (self->priv->frozen_views_altered);
-#line 1211 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->frozen_views_altered = _tmp6_;
#line 7479 "ViewCollection.c"
}
-#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = self->priv->frozen_views_altered;
-#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = view;
-#line 1212 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1213 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
#line 7487 "ViewCollection.c"
}
@@ -7491,57 +7491,57 @@ void view_collection_internal_notify_view_altered (ViewCollection* self, DataVie
void view_collection_internal_notify_geometry_altered (ViewCollection* self, DataView* view) {
gboolean _tmp0_ = FALSE;
-#line 1217 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (IS_VIEW_COLLECTION (self));
-#line 1217 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_if_fail (IS_DATA_VIEW (view));
#line 1218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_if_fail (IS_DATA_VIEW (view));
+#line 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = data_collection_are_notifications_frozen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1218 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp0_) {
#line 7502 "ViewCollection.c"
DataView* _tmp1_ = NULL;
DataView* _tmp2_ = NULL;
GeeCollection* _tmp3_ = NULL;
GeeCollection* _tmp4_ = NULL;
-#line 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = view;
-#line 1219 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_item_geometry_altered (self, _tmp1_);
#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view_collection_notify_item_geometry_altered (self, _tmp1_);
+#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = view;
-#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = data_collection_get_singleton (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_geometries_altered (self, _tmp4_);
-#line 1220 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1221 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_tmp4_);
#line 7521 "ViewCollection.c"
} else {
GeeHashSet* _tmp5_ = NULL;
GeeHashSet* _tmp7_ = NULL;
DataView* _tmp8_ = NULL;
-#line 1222 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = self->priv->frozen_geometries_altered;
-#line 1222 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp5_ == NULL) {
#line 7530 "ViewCollection.c"
GeeHashSet* _tmp6_ = NULL;
-#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = gee_hash_set_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (self->priv->frozen_geometries_altered);
-#line 1223 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->frozen_geometries_altered = _tmp6_;
#line 7538 "ViewCollection.c"
}
-#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = self->priv->frozen_geometries_altered;
-#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = view;
-#line 1224 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1225 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
#line 7546 "ViewCollection.c"
}
@@ -7552,11 +7552,11 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
ViewCollection * self;
GeeHashSet* _tmp0_ = NULL;
GeeHashSet* _tmp9_ = NULL;
-#line 1228 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
#line 1229 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIEW_COLLECTION, ViewCollection);
+#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = self->priv->frozen_views_altered;
-#line 1229 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp0_ != NULL) {
#line 7561 "ViewCollection.c"
GeeHashSet* _tmp8_ = NULL;
@@ -7564,13 +7564,13 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
GeeIterator* _view_it = NULL;
GeeHashSet* _tmp1_ = NULL;
GeeIterator* _tmp2_ = NULL;
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = self->priv->frozen_views_altered;
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp2_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_it = _tmp2_;
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 7575 "ViewCollection.c"
GeeIterator* _tmp3_ = NULL;
@@ -7579,47 +7579,47 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
GeeIterator* _tmp5_ = NULL;
gpointer _tmp6_ = NULL;
DataView* _tmp7_ = NULL;
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp3_ = _view_it;
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp4_ = gee_iterator_next (_tmp3_);
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp4_) {
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 7590 "ViewCollection.c"
}
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp5_ = _view_it;
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp6_ = gee_iterator_get (_tmp5_);
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp6_;
#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view = (DataView*) _tmp6_;
+#line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp7_ = view;
-#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_item_view_altered (self, _tmp7_);
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 7604 "ViewCollection.c"
}
-#line 1230 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1231 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_it);
#line 7608 "ViewCollection.c"
}
-#line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp8_ = self->priv->frozen_views_altered;
-#line 1232 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_views_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view_collection_notify_views_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1234 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (self->priv->frozen_views_altered);
-#line 1233 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1234 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->frozen_views_altered = NULL;
#line 7618 "ViewCollection.c"
}
-#line 1236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp9_ = self->priv->frozen_geometries_altered;
-#line 1236 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (_tmp9_ != NULL) {
#line 7624 "ViewCollection.c"
GeeHashSet* _tmp17_ = NULL;
@@ -7627,13 +7627,13 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
GeeIterator* _view_it = NULL;
GeeHashSet* _tmp10_ = NULL;
GeeIterator* _tmp11_ = NULL;
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp10_ = self->priv->frozen_geometries_altered;
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp11_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_view_it = _tmp11_;
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
while (TRUE) {
#line 7638 "ViewCollection.c"
GeeIterator* _tmp12_ = NULL;
@@ -7642,45 +7642,45 @@ static void view_collection_real_notify_thawed (DataCollection* base) {
GeeIterator* _tmp14_ = NULL;
gpointer _tmp15_ = NULL;
DataView* _tmp16_ = NULL;
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp12_ = _view_it;
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp13_ = gee_iterator_next (_tmp12_);
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!_tmp13_) {
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
break;
#line 7653 "ViewCollection.c"
}
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp14_ = _view_it;
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp15_ = gee_iterator_get (_tmp14_);
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view = (DataView*) _tmp15_;
#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view = (DataView*) _tmp15_;
+#line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp16_ = view;
-#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_collection_notify_item_geometry_altered (self, _tmp16_);
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (view);
#line 7667 "ViewCollection.c"
}
-#line 1237 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1238 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (_view_it);
#line 7671 "ViewCollection.c"
}
-#line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp17_ = self->priv->frozen_geometries_altered;
-#line 1239 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- view_collection_notify_geometries_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ view_collection_notify_geometries_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1241 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_g_object_unref0 (self->priv->frozen_geometries_altered);
-#line 1240 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1241 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->priv->frozen_geometries_altered = NULL;
#line 7681 "ViewCollection.c"
}
-#line 1243 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1244 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
DATA_COLLECTION_CLASS (view_collection_parent_class)->notify_thawed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
#line 7685 "ViewCollection.c"
}
@@ -7690,15 +7690,15 @@ gboolean view_collection_are_items_filtered_out (ViewCollection* self) {
gboolean result = FALSE;
gint _tmp0_ = 0;
gint _tmp1_ = 0;
-#line 1246 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
#line 1247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_VIEW_COLLECTION (self), FALSE);
+#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp0_ = DATA_COLLECTION_CLASS (view_collection_parent_class)->get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
_tmp1_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = _tmp0_ != _tmp1_;
-#line 1247 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1248 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 7703 "ViewCollection.c"
}
@@ -8558,38 +8558,38 @@ GType view_collection_get_type (void) {
static gboolean view_manager_real_include_in_view (ViewManager* self, DataSource* source) {
gboolean result = FALSE;
-#line 1257 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
- g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
#line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+ g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
+#line 1259 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
result = TRUE;
-#line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1259 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return result;
#line 8567 "ViewCollection.c"
}
gboolean view_manager_include_in_view (ViewManager* self, DataSource* source) {
-#line 1257 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_MANAGER (self), FALSE);
-#line 1257 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1258 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_MANAGER_GET_CLASS (self)->include_in_view (self, source);
#line 8576 "ViewCollection.c"
}
static DataView* view_manager_real_create_view (ViewManager* self, DataSource* source) {
-#line 1263 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_critical ("Type `%s' does not implement abstract method `view_manager_create_view'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1263 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
#line 8585 "ViewCollection.c"
}
DataView* view_manager_create_view (ViewManager* self, DataSource* source) {
-#line 1263 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_MANAGER (self), NULL);
-#line 1263 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1264 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_MANAGER_GET_CLASS (self)->create_view (self, source);
#line 8594 "ViewCollection.c"
}
@@ -8597,25 +8597,25 @@ DataView* view_manager_create_view (ViewManager* self, DataSource* source) {
ViewManager* view_manager_construct (GType object_type) {
ViewManager* self = NULL;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = (ViewManager*) g_type_create_instance (object_type);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
#line 8604 "ViewCollection.c"
}
static void value_view_manager_init (GValue* value) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
#line 8611 "ViewCollection.c"
}
static void value_view_manager_free_value (GValue* value) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (value->data[0].v_pointer) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_manager_unref (value->data[0].v_pointer);
#line 8620 "ViewCollection.c"
}
@@ -8623,13 +8623,13 @@ static void value_view_manager_free_value (GValue* value) {
static void value_view_manager_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (src_value->data[0].v_pointer) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dest_value->data[0].v_pointer = view_manager_ref (src_value->data[0].v_pointer);
#line 8630 "ViewCollection.c"
} else {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dest_value->data[0].v_pointer = NULL;
#line 8634 "ViewCollection.c"
}
@@ -8637,37 +8637,37 @@ static void value_view_manager_copy_value (const GValue* src_value, GValue* dest
static gpointer value_view_manager_peek_pointer (const GValue* value) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return value->data[0].v_pointer;
#line 8642 "ViewCollection.c"
}
static gchar* value_view_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (collect_values[0].v_pointer) {
#line 8649 "ViewCollection.c"
ViewManager* object;
object = collect_values[0].v_pointer;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (object->parent_instance.g_class == NULL) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
#line 8656 "ViewCollection.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.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 8660 "ViewCollection.c"
}
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = view_manager_ref (object);
#line 8664 "ViewCollection.c"
} else {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
#line 8668 "ViewCollection.c"
}
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
#line 8672 "ViewCollection.c"
}
@@ -8676,27 +8676,27 @@ static gchar* value_view_manager_collect_value (GValue* value, guint n_collect_v
static gchar* value_view_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
ViewManager** object_p;
object_p = collect_values[0].v_pointer;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!object_p) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
#line 8683 "ViewCollection.c"
}
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!value->data[0].v_pointer) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = NULL;
#line 8689 "ViewCollection.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = value->data[0].v_pointer;
#line 8693 "ViewCollection.c"
} else {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = view_manager_ref (value->data[0].v_pointer);
#line 8697 "ViewCollection.c"
}
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
#line 8701 "ViewCollection.c"
}
@@ -8704,22 +8704,22 @@ static gchar* value_view_manager_lcopy_value (const GValue* value, guint n_colle
GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
ParamSpecViewManager* spec;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIEW_MANAGER), NULL);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return G_PARAM_SPEC (spec);
#line 8715 "ViewCollection.c"
}
gpointer value_get_view_manager (const GValue* value) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER), NULL);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return value->data[0].v_pointer;
#line 8724 "ViewCollection.c"
}
@@ -8727,29 +8727,29 @@ gpointer value_get_view_manager (const GValue* value) {
void value_set_view_manager (GValue* value, gpointer v_object) {
ViewManager* old;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER));
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
old = value->data[0].v_pointer;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (v_object) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_VIEW_MANAGER));
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = v_object;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_manager_ref (value->data[0].v_pointer);
#line 8744 "ViewCollection.c"
} else {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
#line 8748 "ViewCollection.c"
}
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (old) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_manager_unref (old);
#line 8754 "ViewCollection.c"
}
@@ -8758,27 +8758,27 @@ void value_set_view_manager (GValue* value, gpointer v_object) {
void value_take_view_manager (GValue* value, gpointer v_object) {
ViewManager* old;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_MANAGER));
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
old = value->data[0].v_pointer;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (v_object) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_VIEW_MANAGER));
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = v_object;
#line 8773 "ViewCollection.c"
} else {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
#line 8777 "ViewCollection.c"
}
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (old) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_manager_unref (old);
#line 8783 "ViewCollection.c"
}
@@ -8786,20 +8786,20 @@ void value_take_view_manager (GValue* value, gpointer v_object) {
static void view_manager_class_init (ViewManagerClass * klass) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_manager_parent_class = g_type_class_peek_parent (klass);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewManagerClass *) klass)->finalize = view_manager_finalize;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewManagerClass *) klass)->include_in_view = view_manager_real_include_in_view;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewManagerClass *) klass)->create_view = view_manager_real_create_view;
#line 8797 "ViewCollection.c"
}
static void view_manager_instance_init (ViewManager * self) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->ref_count = 1;
#line 8804 "ViewCollection.c"
}
@@ -8807,9 +8807,9 @@ static void view_manager_instance_init (ViewManager * self) {
static void view_manager_finalize (ViewManager* obj) {
ViewManager * self;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_MANAGER, ViewManager);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_signal_handlers_destroy (self);
#line 8814 "ViewCollection.c"
}
@@ -8832,9 +8832,9 @@ GType view_manager_get_type (void) {
gpointer view_manager_ref (gpointer instance) {
ViewManager* self;
self = instance;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_atomic_int_inc (&self->ref_count);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return instance;
#line 8839 "ViewCollection.c"
}
@@ -8843,11 +8843,11 @@ gpointer view_manager_ref (gpointer instance) {
void view_manager_unref (gpointer instance) {
ViewManager* self;
self = instance;
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_MANAGER_GET_CLASS (self)->finalize (self);
-#line 1253 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1254 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_type_free_instance ((GTypeInstance *) self);
#line 8852 "ViewCollection.c"
}
@@ -8855,18 +8855,18 @@ void view_manager_unref (gpointer instance) {
static gboolean view_filter_real_predicate (ViewFilter* self, DataView* view) {
-#line 1285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_critical ("Type `%s' does not implement abstract method `view_filter_predicate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return FALSE;
#line 8862 "ViewCollection.c"
}
gboolean view_filter_predicate (ViewFilter* self, DataView* view) {
-#line 1285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (IS_VIEW_FILTER (self), FALSE);
-#line 1285 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1286 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return VIEW_FILTER_GET_CLASS (self)->predicate (self, view);
#line 8871 "ViewCollection.c"
}
@@ -8874,9 +8874,9 @@ gboolean view_filter_predicate (ViewFilter* self, DataView* view) {
ViewFilter* view_filter_construct (GType object_type) {
ViewFilter* self = NULL;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = (ViewFilter*) g_type_create_instance (object_type);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return self;
#line 8881 "ViewCollection.c"
}
@@ -8887,16 +8887,16 @@ static void view_filter_real_refresh (ViewFilter* self) {
static void value_view_filter_init (GValue* value) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
#line 8892 "ViewCollection.c"
}
static void value_view_filter_free_value (GValue* value) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (value->data[0].v_pointer) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_filter_unref (value->data[0].v_pointer);
#line 8901 "ViewCollection.c"
}
@@ -8904,13 +8904,13 @@ static void value_view_filter_free_value (GValue* value) {
static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (src_value->data[0].v_pointer) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dest_value->data[0].v_pointer = view_filter_ref (src_value->data[0].v_pointer);
#line 8911 "ViewCollection.c"
} else {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
dest_value->data[0].v_pointer = NULL;
#line 8915 "ViewCollection.c"
}
@@ -8918,37 +8918,37 @@ static void value_view_filter_copy_value (const GValue* src_value, GValue* dest_
static gpointer value_view_filter_peek_pointer (const GValue* value) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return value->data[0].v_pointer;
#line 8923 "ViewCollection.c"
}
static gchar* value_view_filter_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (collect_values[0].v_pointer) {
#line 8930 "ViewCollection.c"
ViewFilter* object;
object = collect_values[0].v_pointer;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (object->parent_instance.g_class == NULL) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
#line 8937 "ViewCollection.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.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 8941 "ViewCollection.c"
}
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = view_filter_ref (object);
#line 8945 "ViewCollection.c"
} else {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
#line 8949 "ViewCollection.c"
}
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
#line 8953 "ViewCollection.c"
}
@@ -8957,27 +8957,27 @@ static gchar* value_view_filter_collect_value (GValue* value, guint n_collect_va
static gchar* value_view_filter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
ViewFilter** object_p;
object_p = collect_values[0].v_pointer;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!object_p) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
#line 8964 "ViewCollection.c"
}
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (!value->data[0].v_pointer) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = NULL;
#line 8970 "ViewCollection.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = value->data[0].v_pointer;
#line 8974 "ViewCollection.c"
} else {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
*object_p = view_filter_ref (value->data[0].v_pointer);
#line 8978 "ViewCollection.c"
}
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return NULL;
#line 8982 "ViewCollection.c"
}
@@ -8985,22 +8985,22 @@ static gchar* value_view_filter_lcopy_value (const GValue* value, guint n_collec
GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
ParamSpecViewFilter* spec;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (g_type_is_a (object_type, TYPE_VIEW_FILTER), NULL);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return G_PARAM_SPEC (spec);
#line 8996 "ViewCollection.c"
}
gpointer value_get_view_filter (const GValue* value) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER), NULL);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return value->data[0].v_pointer;
#line 9005 "ViewCollection.c"
}
@@ -9008,29 +9008,29 @@ gpointer value_get_view_filter (const GValue* value) {
void value_set_view_filter (GValue* value, gpointer v_object) {
ViewFilter* old;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER));
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
old = value->data[0].v_pointer;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (v_object) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_VIEW_FILTER));
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = v_object;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_filter_ref (value->data[0].v_pointer);
#line 9025 "ViewCollection.c"
} else {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
#line 9029 "ViewCollection.c"
}
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (old) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_filter_unref (old);
#line 9035 "ViewCollection.c"
}
@@ -9039,27 +9039,27 @@ void value_set_view_filter (GValue* value, gpointer v_object) {
void value_take_view_filter (GValue* value, gpointer v_object) {
ViewFilter* old;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIEW_FILTER));
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
old = value->data[0].v_pointer;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (v_object) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_VIEW_FILTER));
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = v_object;
#line 9054 "ViewCollection.c"
} else {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
value->data[0].v_pointer = NULL;
#line 9058 "ViewCollection.c"
}
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (old) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_filter_unref (old);
#line 9064 "ViewCollection.c"
}
@@ -9067,22 +9067,22 @@ void value_take_view_filter (GValue* value, gpointer v_object) {
static void view_filter_class_init (ViewFilterClass * klass) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
view_filter_parent_class = g_type_class_peek_parent (klass);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewFilterClass *) klass)->finalize = view_filter_finalize;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewFilterClass *) klass)->predicate = view_filter_real_predicate;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
((ViewFilterClass *) klass)->refresh = view_filter_real_refresh;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_signal_new ("refresh", TYPE_VIEW_FILTER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ViewFilterClass, refresh), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 9080 "ViewCollection.c"
}
static void view_filter_instance_init (ViewFilter * self) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self->ref_count = 1;
#line 9087 "ViewCollection.c"
}
@@ -9090,9 +9090,9 @@ static void view_filter_instance_init (ViewFilter * self) {
static void view_filter_finalize (ViewFilter* obj) {
ViewFilter * self;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIEW_FILTER, ViewFilter);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_signal_handlers_destroy (self);
#line 9097 "ViewCollection.c"
}
@@ -9115,9 +9115,9 @@ GType view_filter_get_type (void) {
gpointer view_filter_ref (gpointer instance) {
ViewFilter* self;
self = instance;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_atomic_int_inc (&self->ref_count);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
return instance;
#line 9122 "ViewCollection.c"
}
@@ -9126,11 +9126,11 @@ gpointer view_filter_ref (gpointer instance) {
void view_filter_unref (gpointer instance) {
ViewFilter* self;
self = instance;
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
VIEW_FILTER_GET_CLASS (self)->finalize (self);
-#line 1278 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
+#line 1279 "/home/jens/Source/shotwell/src/core/ViewCollection.vala"
g_type_free_instance ((GTypeInstance *) self);
#line 9135 "ViewCollection.c"
}
diff --git a/src/core/ViewCollection.vala b/src/core/ViewCollection.vala
index ce6fcaf..7e13fb0 100644
--- a/src/core/ViewCollection.vala
+++ b/src/core/ViewCollection.vala
@@ -646,7 +646,8 @@ public class ViewCollection : DataCollection {
}
public override void items_altered(Gee.Map<DataObject, Alteration> map) {
- filter_altered_items(map.keys);
+ // Cast - our DataObjects are DataViews.
+ filter_altered_items((Gee.Collection<DataView>)map.keys);
base.items_altered(map);
}
diff --git a/src/core/util.c b/src/core/util.c
index 0088011..927d070 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -1,4 +1,4 @@
-/* util.c generated by valac 0.32.1, the Vala compiler
+/* util.c generated by valac 0.34.1, the Vala compiler
* generated from util.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/data_imports/DataImportJob.c b/src/data_imports/DataImportJob.c
index 1cef36b..53ee367 100644
--- a/src/data_imports/DataImportJob.c
+++ b/src/data_imports/DataImportJob.c
@@ -1,4 +1,4 @@
-/* DataImportJob.c generated by valac 0.32.1, the Vala compiler
+/* DataImportJob.c generated by valac 0.34.1, the Vala compiler
* generated from DataImportJob.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c
index 4c6b25d..b85a8d2 100644
--- a/src/data_imports/DataImportSource.c
+++ b/src/data_imports/DataImportSource.c
@@ -1,4 +1,4 @@
-/* DataImportSource.c generated by valac 0.32.1, the Vala compiler
+/* DataImportSource.c generated by valac 0.34.1, the Vala compiler
* generated from DataImportSource.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c
index 2b9e8e9..6c4ab60 100644
--- a/src/data_imports/DataImports.c
+++ b/src/data_imports/DataImports.c
@@ -1,4 +1,4 @@
-/* DataImports.c generated by valac 0.32.1, the Vala compiler
+/* DataImports.c generated by valac 0.34.1, the Vala compiler
* generated from DataImports.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c
index 308cd17..be5e38c 100644
--- a/src/data_imports/DataImportsPluginHost.c
+++ b/src/data_imports/DataImportsPluginHost.c
@@ -1,4 +1,4 @@
-/* DataImportsPluginHost.c generated by valac 0.32.1, the Vala compiler
+/* DataImportsPluginHost.c generated by valac 0.34.1, the Vala compiler
* generated from DataImportsPluginHost.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c
index ac73508..cb9749b 100644
--- a/src/data_imports/DataImportsUI.c
+++ b/src/data_imports/DataImportsUI.c
@@ -1,4 +1,4 @@
-/* DataImportsUI.c generated by valac 0.32.1, the Vala compiler
+/* DataImportsUI.c generated by valac 0.34.1, the Vala compiler
* generated from DataImportsUI.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c
index 4e0ada2..7b533de 100644
--- a/src/db/DatabaseTable.c
+++ b/src/db/DatabaseTable.c
@@ -1,4 +1,4 @@
-/* DatabaseTable.c generated by valac 0.32.1, the Vala compiler
+/* DatabaseTable.c generated by valac 0.34.1, the Vala compiler
* generated from DatabaseTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -86,6 +86,7 @@ static void database_table_prepare_db (const gchar* filename);
void app_window_panic (const gchar* msg);
#define DB_IN_MEMORY_NAME ":memory:"
void database_table_on_trace (const gchar* message);
+static void _database_table_on_trace_sqlite_trace_callback (gpointer self, const gchar* message);
void database_table_init (const gchar* filename);
void database_table_warning (const gchar* op, gint res);
void database_table_terminate (void);
@@ -119,6 +120,13 @@ GQuark database_error_quark (void) {
}
+static void _database_table_on_trace_sqlite_trace_callback (gpointer self, const gchar* message) {
+#line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ database_table_on_trace (message);
+#line 127 "DatabaseTable.c"
+}
+
+
static void database_table_prepare_db (const gchar* filename) {
gint res = 0;
const gchar* _tmp0_ = NULL;
@@ -126,6 +134,9 @@ static void database_table_prepare_db (const gchar* filename) {
gint _tmp2_ = 0;
gint _tmp3_ = 0;
const gchar* _tmp9_ = NULL;
+ const gchar* sql_debug = NULL;
+ const gchar* _tmp26_ = NULL;
+ const gchar* _tmp27_ = NULL;
GError * _inner_error_ = NULL;
#line 32 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (filename != NULL);
@@ -143,7 +154,7 @@ static void database_table_prepare_db (const gchar* filename) {
_tmp3_ = res;
#line 36 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp3_ != SQLITE_OK) {
-#line 147 "DatabaseTable.c"
+#line 158 "DatabaseTable.c"
const gchar* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
gint _tmp6_ = 0;
@@ -163,13 +174,13 @@ static void database_table_prepare_db (const gchar* filename) {
app_window_panic (_tmp8_);
#line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp8_);
-#line 167 "DatabaseTable.c"
+#line 178 "DatabaseTable.c"
}
#line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = filename;
#line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (g_strcmp0 (_tmp9_, DB_IN_MEMORY_NAME) != 0) {
-#line 173 "DatabaseTable.c"
+#line 184 "DatabaseTable.c"
{
GFile* file_db = NULL;
const gchar* _tmp10_ = NULL;
@@ -195,7 +206,7 @@ static void database_table_prepare_db (const gchar* filename) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_object_unref0 (file_db);
-#line 199 "DatabaseTable.c"
+#line 210 "DatabaseTable.c"
goto __catch13_g_error;
}
#line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -204,7 +215,7 @@ static void database_table_prepare_db (const gchar* filename) {
_tmp15_ = g_file_info_get_attribute_boolean (_tmp14_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
#line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (!_tmp15_) {
-#line 208 "DatabaseTable.c"
+#line 219 "DatabaseTable.c"
const gchar* _tmp16_ = NULL;
const gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
@@ -221,13 +232,13 @@ static void database_table_prepare_db (const gchar* filename) {
app_window_panic (_tmp19_);
#line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp19_);
-#line 225 "DatabaseTable.c"
+#line 236 "DatabaseTable.c"
}
#line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_object_unref0 (info);
#line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_object_unref0 (file_db);
-#line 231 "DatabaseTable.c"
+#line 242 "DatabaseTable.c"
}
goto __finally13;
__catch13_g_error:
@@ -261,7 +272,7 @@ static void database_table_prepare_db (const gchar* filename) {
_g_free0 (_tmp25_);
#line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_error_free0 (e);
-#line 265 "DatabaseTable.c"
+#line 276 "DatabaseTable.c"
}
__finally13:
#line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -272,21 +283,37 @@ static void database_table_prepare_db (const gchar* filename) {
g_clear_error (&_inner_error_);
#line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 276 "DatabaseTable.c"
+#line 287 "DatabaseTable.c"
}
}
+#line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ _tmp26_ = g_getenv ("SHOTWELL_SQL_DEBUG");
+#line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ sql_debug = _tmp26_;
+#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ _tmp27_ = sql_debug;
+#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ if (g_strcmp0 (_tmp27_, "") != 0) {
+#line 298 "DatabaseTable.c"
+ sqlite3* _tmp28_ = NULL;
+#line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ _tmp28_ = database_table_db;
+#line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ sqlite3_trace (_tmp28_, _database_table_on_trace_sqlite_trace_callback, NULL);
+#line 304 "DatabaseTable.c"
+ }
}
void database_table_on_trace (const gchar* message) {
const gchar* _tmp0_ = NULL;
-#line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 61 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (message != NULL);
-#line 58 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = message;
-#line 58 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
- g_debug ("DatabaseTable.vala:58: SQLITE: %s", _tmp0_);
-#line 290 "DatabaseTable.c"
+#line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ g_debug ("DatabaseTable.vala:62: SQLITE: %s", _tmp0_);
+#line 317 "DatabaseTable.c"
}
@@ -301,56 +328,56 @@ static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback cal
const gchar* _tmp2_ = NULL;
gint _tmp3_ = 0;
const gchar* _tmp6_ = NULL;
-#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 34 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 34 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
g_return_val_if_fail (sql != NULL, 0);
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
_tmp0_ = sql;
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
_tmp1_ = callback;
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
_tmp1__target = callback_target;
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
_tmp3_ = sqlite3_exec (self, _tmp0_, _tmp1_, _tmp1__target, (char**) (&_tmp2_));
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
sqlite_errmsg = _tmp2_;
-#line 36 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 36 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
ec = _tmp3_;
-#line 37 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 37 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
if ((&_vala_errmsg) != NULL) {
-#line 323 "DatabaseTable.c"
+#line 350 "DatabaseTable.c"
const gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
-#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
_tmp4_ = sqlite_errmsg;
-#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
_tmp5_ = g_strdup (_tmp4_);
-#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
_g_free0 (_vala_errmsg);
-#line 38 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
_vala_errmsg = _tmp5_;
-#line 334 "DatabaseTable.c"
+#line 361 "DatabaseTable.c"
}
-#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
_tmp6_ = sqlite_errmsg;
-#line 40 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
sqlite3_free ((void*) _tmp6_);
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
result = ec;
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
if (errmsg) {
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
*errmsg = _vala_errmsg;
-#line 346 "DatabaseTable.c"
+#line 373 "DatabaseTable.c"
} else {
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
_g_free0 (_vala_errmsg);
-#line 350 "DatabaseTable.c"
+#line 377 "DatabaseTable.c"
}
-#line 41 "/usr/share/vala-0.32/vapi/sqlite3.vapi"
+#line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
return result;
-#line 354 "DatabaseTable.c"
+#line 381 "DatabaseTable.c"
}
@@ -366,41 +393,41 @@ void database_table_init (const gchar* filename) {
gint _tmp20_ = 0;
gint _tmp21_ = 0;
GError * _inner_error_ = NULL;
-#line 61 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (filename != NULL);
-#line 63 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = filename;
-#line 63 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
- database_table_prepare_db (_tmp0_);
#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ database_table_prepare_db (_tmp0_);
+#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = database_table_db;
-#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = sqlite3_prepare_v2 (_tmp1_, "CREATE TABLE IF NOT EXISTS VersionTable (" "id INTEGER PRIMARY KEY, " "schema_version INTEGER, " "app_version TEXT, " "user_data TEXT NULL" ")", -1, &_tmp2_, NULL);
-#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
stmt = _tmp2_;
-#line 67 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 71 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp3_;
-#line 75 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp4_ = res;
-#line 75 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp4_ != SQLITE_OK) {
-#line 390 "DatabaseTable.c"
+#line 417 "DatabaseTable.c"
gchar* backup_path = NULL;
const gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 76 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_close0 (database_table_db);
-#line 76 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_db = NULL;
-#line 78 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = filename;
-#line 78 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = g_strconcat (_tmp5_, ".bak", NULL);
-#line 78 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
backup_path = _tmp6_;
-#line 404 "DatabaseTable.c"
+#line 431 "DatabaseTable.c"
{
GFile* src = NULL;
const gchar* _tmp7_ = NULL;
@@ -411,42 +438,42 @@ void database_table_init (const gchar* filename) {
GFile* _tmp11_ = NULL;
GFile* _tmp12_ = NULL;
const gchar* _tmp13_ = NULL;
-#line 81 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = backup_path;
-#line 81 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = g_file_new_for_commandline_arg (_tmp7_);
-#line 81 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 85 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
src = _tmp8_;
-#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = filename;
-#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp10_ = g_file_new_for_commandline_arg (_tmp9_);
-#line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
dest = _tmp10_;
-#line 83 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp11_ = src;
-#line 83 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp12_ = dest;
-#line 83 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_file_copy (_tmp11_, _tmp12_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_);
-#line 83 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 83 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_object_unref0 (dest);
-#line 83 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_object_unref0 (src);
-#line 439 "DatabaseTable.c"
+#line 466 "DatabaseTable.c"
goto __catch14_g_error;
}
-#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp13_ = filename;
-#line 86 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_prepare_db (_tmp13_);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_object_unref0 (dest);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_object_unref0 (src);
-#line 450 "DatabaseTable.c"
+#line 477 "DatabaseTable.c"
}
goto __finally14;
__catch14_g_error:
@@ -457,77 +484,77 @@ void database_table_init (const gchar* filename) {
const gchar* _tmp16_ = NULL;
gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_error_ = _inner_error_;
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_inner_error_ = NULL;
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp14_ = _ ("Unable to restore photo database %s");
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp15_ = _error_;
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp16_ = _tmp15_->message;
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp17_ = g_strdup_printf (_tmp14_, _tmp16_);
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp18_ = _tmp17_;
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
app_window_panic (_tmp18_);
-#line 88 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 92 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp18_);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_error_free0 (_error_);
-#line 481 "DatabaseTable.c"
+#line 508 "DatabaseTable.c"
}
__finally14:
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (backup_path);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_clear_error (&_inner_error_);
-#line 80 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 496 "DatabaseTable.c"
+#line 523 "DatabaseTable.c"
}
-#line 75 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (backup_path);
-#line 500 "DatabaseTable.c"
+#line 527 "DatabaseTable.c"
}
-#line 94 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp19_ = database_table_db;
-#line 94 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp20_ = _sqlite3_exec (_tmp19_, "PRAGMA synchronous=OFF", NULL, NULL, NULL);
-#line 94 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp20_;
-#line 95 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp21_ = res;
-#line 95 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp21_ != SQLITE_OK) {
-#line 512 "DatabaseTable.c"
+#line 539 "DatabaseTable.c"
gint _tmp22_ = 0;
-#line 96 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp22_ = res;
-#line 96 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_warning ("Unable to disable synchronous mode", _tmp22_);
-#line 518 "DatabaseTable.c"
+#line 545 "DatabaseTable.c"
}
-#line 61 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 522 "DatabaseTable.c"
+#line 549 "DatabaseTable.c"
}
void database_table_terminate (void) {
-#line 101 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_close0 (database_table_db);
-#line 101 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_db = NULL;
-#line 531 "DatabaseTable.c"
+#line 558 "DatabaseTable.c"
}
@@ -536,19 +563,19 @@ void database_table_fatal (const gchar* op, gint res) {
gint _tmp1_ = 0;
sqlite3* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
-#line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 109 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (op != NULL);
-#line 106 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = op;
-#line 106 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = res;
-#line 106 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = database_table_db;
-#line 106 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = sqlite3_errmsg (_tmp2_);
-#line 106 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
- g_error ("DatabaseTable.vala:106: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_);
-#line 552 "DatabaseTable.c"
+#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ g_error ("DatabaseTable.vala:110: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_);
+#line 579 "DatabaseTable.c"
}
@@ -557,38 +584,38 @@ void database_table_warning (const gchar* op, gint res) {
gint _tmp1_ = 0;
sqlite3* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
-#line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 114 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (op != NULL);
-#line 111 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = op;
-#line 111 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = res;
-#line 111 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = database_table_db;
-#line 111 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = sqlite3_errmsg (_tmp2_);
-#line 111 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
- g_warning ("DatabaseTable.vala:111: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_);
-#line 573 "DatabaseTable.c"
+#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ g_warning ("DatabaseTable.vala:115: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_);
+#line 600 "DatabaseTable.c"
}
void database_table_set_table_name (DatabaseTable* self, const gchar* table_name) {
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 114 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 114 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 118 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (table_name != NULL);
-#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = table_name;
-#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (self->table_name);
-#line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
self->table_name = _tmp1_;
-#line 592 "DatabaseTable.c"
+#line 619 "DatabaseTable.c"
}
@@ -601,277 +628,277 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
gchar* _tmp4_ = NULL;
gint _tmp5_ = 0;
GError * _inner_error_ = NULL;
-#line 120 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (method != NULL);
-#line 121 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = method;
-#line 121 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = res;
-#line 121 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = database_table_db;
-#line 121 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = sqlite3_errmsg (_tmp2_);
-#line 121 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp4_ = g_strdup_printf ("(%s) [%d] - %s", _tmp0_, _tmp1_, _tmp3_);
-#line 121 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 125 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
msg = _tmp4_;
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = res;
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
switch (_tmp5_) {
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_OK:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_DONE:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_ROW:
-#line 629 "DatabaseTable.c"
+#line 656 "DatabaseTable.c"
{
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 635 "DatabaseTable.c"
+#line 662 "DatabaseTable.c"
}
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_PERM:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_BUSY:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_READONLY:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_IOERR:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_CORRUPT:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_CANTOPEN:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_NOLFS:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_AUTH:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_FORMAT:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_NOTADB:
-#line 657 "DatabaseTable.c"
+#line 684 "DatabaseTable.c"
{
const gchar* _tmp6_ = NULL;
GError* _tmp7_ = NULL;
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = msg;
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_BACKING, _tmp6_);
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_inner_error_ = _tmp7_;
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_propagate_error (error, _inner_error_);
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 675 "DatabaseTable.c"
+#line 702 "DatabaseTable.c"
} else {
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_clear_error (&_inner_error_);
-#line 139 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 685 "DatabaseTable.c"
+#line 712 "DatabaseTable.c"
}
}
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_NOMEM:
-#line 690 "DatabaseTable.c"
+#line 717 "DatabaseTable.c"
{
const gchar* _tmp8_ = NULL;
GError* _tmp9_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = msg;
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_MEMORY, _tmp8_);
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_inner_error_ = _tmp9_;
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_propagate_error (error, _inner_error_);
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 708 "DatabaseTable.c"
+#line 735 "DatabaseTable.c"
} else {
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_clear_error (&_inner_error_);
-#line 142 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 718 "DatabaseTable.c"
+#line 745 "DatabaseTable.c"
}
}
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_ABORT:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_LOCKED:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_INTERRUPT:
-#line 727 "DatabaseTable.c"
+#line 754 "DatabaseTable.c"
{
const gchar* _tmp10_ = NULL;
GError* _tmp11_ = NULL;
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp10_ = msg;
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp11_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ABORT, _tmp10_);
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_inner_error_ = _tmp11_;
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_propagate_error (error, _inner_error_);
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 745 "DatabaseTable.c"
+#line 772 "DatabaseTable.c"
} else {
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_clear_error (&_inner_error_);
-#line 147 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 755 "DatabaseTable.c"
+#line 782 "DatabaseTable.c"
}
}
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_FULL:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_EMPTY:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_TOOBIG:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_CONSTRAINT:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_RANGE:
-#line 768 "DatabaseTable.c"
+#line 795 "DatabaseTable.c"
{
const gchar* _tmp12_ = NULL;
GError* _tmp13_ = NULL;
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp12_ = msg;
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp13_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_LIMITS, _tmp12_);
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_inner_error_ = _tmp13_;
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_propagate_error (error, _inner_error_);
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 786 "DatabaseTable.c"
+#line 813 "DatabaseTable.c"
} else {
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_clear_error (&_inner_error_);
-#line 154 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 796 "DatabaseTable.c"
+#line 823 "DatabaseTable.c"
}
}
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_SCHEMA:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_MISMATCH:
-#line 803 "DatabaseTable.c"
+#line 830 "DatabaseTable.c"
{
const gchar* _tmp14_ = NULL;
GError* _tmp15_ = NULL;
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp14_ = msg;
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp15_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_TYPESPEC, _tmp14_);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_inner_error_ = _tmp15_;
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_propagate_error (error, _inner_error_);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 821 "DatabaseTable.c"
+#line 848 "DatabaseTable.c"
} else {
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_clear_error (&_inner_error_);
-#line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 831 "DatabaseTable.c"
+#line 858 "DatabaseTable.c"
}
}
default:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_ERROR:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_INTERNAL:
-#line 123 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
case SQLITE_MISUSE:
-#line 841 "DatabaseTable.c"
+#line 868 "DatabaseTable.c"
{
const gchar* _tmp16_ = NULL;
GError* _tmp17_ = NULL;
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp16_ = msg;
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp17_ = g_error_new_literal (DATABASE_ERROR, DATABASE_ERROR_ERROR, _tmp16_);
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_inner_error_ = _tmp17_;
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_propagate_error (error, _inner_error_);
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 859 "DatabaseTable.c"
+#line 886 "DatabaseTable.c"
} else {
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_clear_error (&_inner_error_);
-#line 164 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 869 "DatabaseTable.c"
+#line 896 "DatabaseTable.c"
}
}
}
-#line 120 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (msg);
-#line 875 "DatabaseTable.c"
+#line 902 "DatabaseTable.c"
}
@@ -896,69 +923,69 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) {
gboolean _tmp14_ = FALSE;
gint _tmp15_ = 0;
gint _tmp24_ = 0;
-#line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 172 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = database_table_db;
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = self->table_name;
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = g_strdup_printf ("SELECT id FROM %s WHERE id=?", _tmp1_);
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = _tmp2_;
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL);
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
stmt = _tmp4_;
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = _tmp5_;
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp3_);
-#line 170 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp6_;
-#line 171 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 175 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = res;
-#line 171 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 175 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 173 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = stmt;
-#line 173 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = id;
-#line 173 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp10_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp9_);
-#line 173 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp10_;
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp11_ = res;
-#line 174 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 176 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp12_ = stmt;
-#line 176 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp13_ = sqlite3_step (_tmp12_);
-#line 176 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp13_;
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp15_ = res;
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp15_ != SQLITE_ROW) {
-#line 948 "DatabaseTable.c"
+#line 975 "DatabaseTable.c"
gint _tmp16_ = 0;
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp16_ = res;
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp14_ = _tmp16_ != SQLITE_DONE;
-#line 954 "DatabaseTable.c"
+#line 981 "DatabaseTable.c"
} else {
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp14_ = FALSE;
-#line 958 "DatabaseTable.c"
+#line 985 "DatabaseTable.c"
}
-#line 177 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp14_) {
-#line 962 "DatabaseTable.c"
+#line 989 "DatabaseTable.c"
gint64 _tmp17_ = 0LL;
gchar* _tmp18_ = NULL;
gchar* _tmp19_ = NULL;
@@ -966,37 +993,37 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) {
gchar* _tmp21_ = NULL;
gchar* _tmp22_ = NULL;
gint _tmp23_ = 0;
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp17_ = id;
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp18_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp17_);
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp19_ = _tmp18_;
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp20_ = self->table_name;
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp21_ = g_strdup_printf ("exists_by_id [%s] %s", _tmp19_, _tmp20_);
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp22_ = _tmp21_;
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp23_ = res;
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_fatal (_tmp22_, _tmp23_);
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp22_);
-#line 178 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp19_);
-#line 990 "DatabaseTable.c"
+#line 1017 "DatabaseTable.c"
}
-#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp24_ = res;
-#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = _tmp24_ == SQLITE_ROW;
-#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 180 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 1000 "DatabaseTable.c"
+#line 1027 "DatabaseTable.c"
}
@@ -1022,71 +1049,71 @@ gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gcha
gboolean _tmp14_ = FALSE;
gint _tmp15_ = 0;
gint _tmp25_ = 0;
-#line 183 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 183 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (columns != NULL, FALSE);
-#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = columns;
-#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = self->table_name;
-#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = g_strdup_printf ("SELECT %s FROM %s WHERE id=?", _tmp0_, _tmp1_);
-#line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 188 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
sql = _tmp2_;
-#line 186 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = database_table_db;
-#line 186 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp4_ = sql;
-#line 186 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = sqlite3_prepare_v2 (_tmp3_, _tmp4_, -1, &_tmp5_, NULL);
-#line 186 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (_vala_stmt);
-#line 186 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_stmt = _tmp5_;
-#line 186 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp6_;
-#line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 191 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = res;
-#line 187 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 191 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 189 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = _vala_stmt;
-#line 189 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = id;
-#line 189 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp10_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp9_);
-#line 189 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp10_;
-#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp11_ = res;
-#line 190 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 192 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp12_ = _vala_stmt;
-#line 192 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp13_ = sqlite3_step (_tmp12_);
-#line 192 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp13_;
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp15_ = res;
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp15_ != SQLITE_ROW) {
-#line 1076 "DatabaseTable.c"
+#line 1103 "DatabaseTable.c"
gint _tmp16_ = 0;
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp16_ = res;
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp14_ = _tmp16_ != SQLITE_DONE;
-#line 1082 "DatabaseTable.c"
+#line 1109 "DatabaseTable.c"
} else {
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp14_ = FALSE;
-#line 1086 "DatabaseTable.c"
+#line 1113 "DatabaseTable.c"
}
-#line 193 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp14_) {
-#line 1090 "DatabaseTable.c"
+#line 1117 "DatabaseTable.c"
gint64 _tmp17_ = 0LL;
gchar* _tmp18_ = NULL;
gchar* _tmp19_ = NULL;
@@ -1095,49 +1122,49 @@ gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gcha
gchar* _tmp22_ = NULL;
gchar* _tmp23_ = NULL;
gint _tmp24_ = 0;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp17_ = id;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp18_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp17_);
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp19_ = _tmp18_;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp20_ = self->table_name;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp21_ = columns;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp22_ = g_strdup_printf ("select_by_id [%s] %s %s", _tmp19_, _tmp20_, _tmp21_);
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp23_ = _tmp22_;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp24_ = res;
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_fatal (_tmp23_, _tmp24_);
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp23_);
-#line 194 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp19_);
-#line 1121 "DatabaseTable.c"
+#line 1148 "DatabaseTable.c"
}
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp25_ = res;
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = _tmp25_ == SQLITE_ROW;
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (sql);
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (stmt) {
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
*stmt = _vala_stmt;
-#line 1133 "DatabaseTable.c"
+#line 1160 "DatabaseTable.c"
} else {
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (_vala_stmt);
-#line 1137 "DatabaseTable.c"
+#line 1164 "DatabaseTable.c"
}
-#line 196 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 1141 "DatabaseTable.c"
+#line 1168 "DatabaseTable.c"
}
@@ -1155,53 +1182,53 @@ static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id,
gint64 _tmp7_ = 0LL;
gint _tmp8_ = 0;
gint _tmp9_ = 0;
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (column != NULL);
-#line 201 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = self->table_name;
-#line 201 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = column;
-#line 201 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = g_strdup_printf ("UPDATE %s SET %s=? WHERE id=?", _tmp0_, _tmp1_);
-#line 201 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 205 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
sql = _tmp2_;
-#line 203 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = database_table_db;
-#line 203 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = sqlite3_prepare_v2 (_tmp3_, sql, -1, &_tmp4_, NULL);
-#line 203 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (_vala_stmt);
-#line 203 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_stmt = _tmp4_;
-#line 203 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp5_;
-#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 208 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = res;
-#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 208 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 206 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = id;
-#line 206 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = sqlite3_bind_int64 (_vala_stmt, 2, _tmp7_);
-#line 206 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp8_;
-#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = res;
-#line 207 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (sql);
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (stmt) {
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
*stmt = _vala_stmt;
-#line 1201 "DatabaseTable.c"
+#line 1228 "DatabaseTable.c"
} else {
-#line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (_vala_stmt);
-#line 1205 "DatabaseTable.c"
+#line 1232 "DatabaseTable.c"
}
}
@@ -1212,37 +1239,37 @@ static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite
sqlite3_stmt* _tmp0_ = NULL;
gint _tmp1_ = 0;
gint _tmp2_ = 0;
-#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 210 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 214 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (stmt != NULL, FALSE);
-#line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = stmt;
-#line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = sqlite3_step (_tmp0_);
-#line 211 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp1_;
-#line 212 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 216 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = res;
-#line 212 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 216 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp2_ != SQLITE_DONE) {
-#line 1230 "DatabaseTable.c"
+#line 1257 "DatabaseTable.c"
gint _tmp3_ = 0;
-#line 213 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = res;
-#line 213 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_fatal ("execute_update_by_id", _tmp3_);
-#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 219 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = FALSE;
-#line 215 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 219 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 1240 "DatabaseTable.c"
+#line 1267 "DatabaseTable.c"
}
-#line 218 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = TRUE;
-#line 218 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 1246 "DatabaseTable.c"
+#line 1273 "DatabaseTable.c"
}
@@ -1258,43 +1285,43 @@ gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const
GDestroyNotify _tmp5_ = NULL;
gint _tmp6_ = 0;
gboolean _tmp7_ = FALSE;
-#line 221 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 221 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (column != NULL, FALSE);
-#line 221 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (text != NULL, FALSE);
-#line 223 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = id;
-#line 223 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = column;
-#line 223 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 223 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 223 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
stmt = _tmp2_;
-#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = text;
-#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp4_ = g_strdup (_tmp3_);
-#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = g_free;
-#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = sqlite3_bind_text (stmt, 1, _tmp4_, -1, _tmp5_);
-#line 225 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp6_;
-#line 226 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 230 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (res == SQLITE_OK, "res == Sqlite.OK");
-#line 228 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = database_table_execute_update_by_id (self, stmt);
-#line 228 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = _tmp7_;
-#line 228 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 228 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 1298 "DatabaseTable.c"
+#line 1325 "DatabaseTable.c"
}
@@ -1314,95 +1341,95 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g
gint _tmp10_ = 0;
gint _tmp11_ = 0;
GError * _inner_error_ = NULL;
-#line 231 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 231 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (column != NULL);
-#line 231 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (text != NULL);
-#line 233 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = id;
-#line 233 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = column;
-#line 233 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 233 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 233 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 237 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
stmt = _tmp2_;
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = stmt;
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp4_ = text;
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = g_strdup (_tmp4_);
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = g_free;
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = sqlite3_bind_text (_tmp3_, 1, _tmp5_, -1, _tmp6_);
-#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp7_;
-#line 236 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = res;
-#line 236 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 238 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = stmt;
-#line 238 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp10_ = sqlite3_step (_tmp9_);
-#line 238 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp10_;
-#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp11_ = res;
-#line 239 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp11_ != SQLITE_DONE) {
-#line 1360 "DatabaseTable.c"
+#line 1387 "DatabaseTable.c"
const gchar* _tmp12_ = NULL;
const gchar* _tmp13_ = NULL;
gchar* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
gint _tmp16_ = 0;
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp12_ = self->table_name;
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp13_ = column;
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp14_ = g_strdup_printf ("DatabaseTable.update_text_by_id_2 %s.%s", _tmp12_, _tmp13_);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp15_ = _tmp14_;
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp16_ = res;
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_throw_error (_tmp15_, _tmp16_, &_inner_error_);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp15_);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_propagate_error (error, _inner_error_);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 1390 "DatabaseTable.c"
+#line 1417 "DatabaseTable.c"
} else {
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_critical ("file %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/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_clear_error (&_inner_error_);
-#line 240 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 1400 "DatabaseTable.c"
+#line 1427 "DatabaseTable.c"
}
}
}
-#line 231 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 1406 "DatabaseTable.c"
+#line 1433 "DatabaseTable.c"
}
@@ -1416,37 +1443,37 @@ gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const
gint _tmp3_ = 0;
gint _tmp4_ = 0;
gboolean _tmp5_ = FALSE;
-#line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (column != NULL, FALSE);
-#line 245 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = id;
-#line 245 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = column;
-#line 245 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 245 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 245 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
stmt = _tmp2_;
-#line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 251 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = value;
-#line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 251 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp4_ = sqlite3_bind_int (stmt, 1, _tmp3_);
-#line 247 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 251 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp4_;
-#line 248 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 252 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (res == SQLITE_OK, "res == Sqlite.OK");
-#line 250 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = database_table_execute_update_by_id (self, stmt);
-#line 250 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = _tmp5_;
-#line 250 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 250 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 1450 "DatabaseTable.c"
+#line 1477 "DatabaseTable.c"
}
@@ -1464,89 +1491,89 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc
gint _tmp8_ = 0;
gint _tmp9_ = 0;
GError * _inner_error_ = NULL;
-#line 253 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 253 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (column != NULL);
-#line 255 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = id;
-#line 255 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = column;
-#line 255 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 255 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 255 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 259 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
stmt = _tmp2_;
-#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = stmt;
-#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp4_ = value;
-#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = sqlite3_bind_int (_tmp3_, 1, _tmp4_);
-#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp5_;
-#line 258 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = res;
-#line 258 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 260 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = stmt;
-#line 260 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = sqlite3_step (_tmp7_);
-#line 260 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 264 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp8_;
-#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = res;
-#line 261 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp9_ != SQLITE_DONE) {
-#line 1504 "DatabaseTable.c"
+#line 1531 "DatabaseTable.c"
const gchar* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
gchar* _tmp12_ = NULL;
gchar* _tmp13_ = NULL;
gint _tmp14_ = 0;
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp10_ = self->table_name;
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp11_ = column;
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp12_ = g_strdup_printf ("DatabaseTable.update_int_by_id_2 %s.%s", _tmp10_, _tmp11_);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp13_ = _tmp12_;
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp14_ = res;
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_throw_error (_tmp13_, _tmp14_, &_inner_error_);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp13_);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_propagate_error (error, _inner_error_);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 1534 "DatabaseTable.c"
+#line 1561 "DatabaseTable.c"
} else {
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_clear_error (&_inner_error_);
-#line 262 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 1544 "DatabaseTable.c"
+#line 1571 "DatabaseTable.c"
}
}
}
-#line 253 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 1550 "DatabaseTable.c"
+#line 1577 "DatabaseTable.c"
}
@@ -1560,37 +1587,37 @@ gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, cons
gint64 _tmp3_ = 0LL;
gint _tmp4_ = 0;
gboolean _tmp5_ = FALSE;
-#line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (IS_DATABASE_TABLE (self), FALSE);
-#line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (column != NULL, FALSE);
-#line 267 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = id;
-#line 267 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = column;
-#line 267 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 267 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 267 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 271 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
stmt = _tmp2_;
-#line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = value;
-#line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp4_ = sqlite3_bind_int64 (stmt, 1, _tmp3_);
-#line 269 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp4_;
-#line 270 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 274 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (res == SQLITE_OK, "res == Sqlite.OK");
-#line 272 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = database_table_execute_update_by_id (self, stmt);
-#line 272 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = _tmp5_;
-#line 272 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 272 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 1594 "DatabaseTable.c"
+#line 1621 "DatabaseTable.c"
}
@@ -1608,89 +1635,89 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const
gint _tmp8_ = 0;
gint _tmp9_ = 0;
GError * _inner_error_ = NULL;
-#line 275 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 275 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (column != NULL);
-#line 277 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = id;
-#line 277 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = column;
-#line 277 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_prepare_update_by_id (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 277 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 277 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 281 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
stmt = _tmp2_;
-#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = stmt;
-#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp4_ = value;
-#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = sqlite3_bind_int64 (_tmp3_, 1, _tmp4_);
-#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp5_;
-#line 280 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = res;
-#line 280 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 282 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = stmt;
-#line 282 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = sqlite3_step (_tmp7_);
-#line 282 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 286 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp8_;
-#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = res;
-#line 283 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp9_ != SQLITE_DONE) {
-#line 1648 "DatabaseTable.c"
+#line 1675 "DatabaseTable.c"
const gchar* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
gchar* _tmp12_ = NULL;
gchar* _tmp13_ = NULL;
gint _tmp14_ = 0;
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp10_ = self->table_name;
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp11_ = column;
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp12_ = g_strdup_printf ("DatabaseTable.update_int64_by_id_2 %s.%s", _tmp10_, _tmp11_);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp13_ = _tmp12_;
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp14_ = res;
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_throw_error (_tmp13_, _tmp14_, &_inner_error_);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp13_);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_propagate_error (error, _inner_error_);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 1678 "DatabaseTable.c"
+#line 1705 "DatabaseTable.c"
} else {
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_clear_error (&_inner_error_);
-#line 284 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 1688 "DatabaseTable.c"
+#line 1715 "DatabaseTable.c"
}
}
}
-#line 275 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 1694 "DatabaseTable.c"
+#line 1721 "DatabaseTable.c"
}
@@ -1713,98 +1740,98 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error
gint _tmp13_ = 0;
gint _tmp14_ = 0;
GError * _inner_error_ = NULL;
-#line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_if_fail (IS_DATABASE_TABLE (self));
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = database_table_db;
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = self->table_name;
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = g_strdup_printf ("DELETE FROM %s WHERE id=?", _tmp1_);
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = _tmp2_;
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL);
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
stmt = _tmp4_;
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = _tmp5_;
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp3_);
-#line 289 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp6_;
-#line 290 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 294 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = res;
-#line 290 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 294 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 292 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = stmt;
-#line 292 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = id;
-#line 292 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp10_ = sqlite3_bind_int64 (_tmp8_, 1, _tmp9_);
-#line 292 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp10_;
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp11_ = res;
-#line 293 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 295 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp12_ = stmt;
-#line 295 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp13_ = sqlite3_step (_tmp12_);
-#line 295 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 299 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp13_;
-#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp14_ = res;
-#line 296 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp14_ != SQLITE_DONE) {
-#line 1765 "DatabaseTable.c"
+#line 1792 "DatabaseTable.c"
const gchar* _tmp15_ = NULL;
gchar* _tmp16_ = NULL;
gchar* _tmp17_ = NULL;
gint _tmp18_ = 0;
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp15_ = self->table_name;
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp16_ = g_strdup_printf ("%s.remove", _tmp15_);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp17_ = _tmp16_;
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp18_ = res;
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_throw_error (_tmp17_, _tmp18_, &_inner_error_);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp17_);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_propagate_error (error, _inner_error_);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 1792 "DatabaseTable.c"
+#line 1819 "DatabaseTable.c"
} else {
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_clear_error (&_inner_error_);
-#line 297 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 1802 "DatabaseTable.c"
+#line 1829 "DatabaseTable.c"
}
}
}
-#line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 1808 "DatabaseTable.c"
+#line 1835 "DatabaseTable.c"
}
@@ -1820,90 +1847,90 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
gint _tmp5_ = 0;
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (table_name != NULL, FALSE);
-#line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (column_name != NULL, FALSE);
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = database_table_db;
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = table_name;
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = g_strdup_printf ("PRAGMA table_info(%s)", _tmp1_);
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = _tmp2_;
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL);
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
stmt = _tmp4_;
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = _tmp5_;
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp3_);
-#line 302 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp6_;
-#line 303 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = res;
-#line 303 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1852 "DatabaseTable.c"
+#line 1879 "DatabaseTable.c"
{
gboolean _tmp8_ = FALSE;
-#line 305 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = TRUE;
-#line 305 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
while (TRUE) {
-#line 1859 "DatabaseTable.c"
+#line 1886 "DatabaseTable.c"
sqlite3_stmt* _tmp9_ = NULL;
gint _tmp10_ = 0;
gint _tmp11_ = 0;
-#line 305 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (!_tmp8_) {
-#line 1865 "DatabaseTable.c"
+#line 1892 "DatabaseTable.c"
}
-#line 305 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = FALSE;
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = stmt;
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp10_ = sqlite3_step (_tmp9_);
-#line 306 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp10_;
-#line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 311 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp11_ = res;
-#line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 311 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp11_ == SQLITE_DONE) {
-#line 308 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 312 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
break;
-#line 1881 "DatabaseTable.c"
+#line 1908 "DatabaseTable.c"
} else {
gint _tmp12_ = 0;
-#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp12_ = res;
-#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp12_ != SQLITE_ROW) {
-#line 1888 "DatabaseTable.c"
+#line 1915 "DatabaseTable.c"
const gchar* _tmp13_ = NULL;
gchar* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
gint _tmp16_ = 0;
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp13_ = table_name;
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp14_ = g_strdup_printf ("has_column %s", _tmp13_);
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp15_ = _tmp14_;
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp16_ = res;
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_fatal (_tmp15_, _tmp16_);
-#line 310 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp15_);
-#line 312 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
break;
-#line 1907 "DatabaseTable.c"
+#line 1934 "DatabaseTable.c"
} else {
gchar* column = NULL;
sqlite3_stmt* _tmp17_ = NULL;
@@ -1911,59 +1938,59 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
gchar* _tmp19_ = NULL;
gboolean _tmp20_ = FALSE;
const gchar* _tmp21_ = NULL;
-#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp17_ = stmt;
-#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp18_ = sqlite3_column_text (_tmp17_, 1);
-#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp19_ = g_strdup (_tmp18_);
-#line 314 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 318 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
column = _tmp19_;
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp21_ = column;
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp21_ != NULL) {
-#line 1927 "DatabaseTable.c"
+#line 1954 "DatabaseTable.c"
const gchar* _tmp22_ = NULL;
const gchar* _tmp23_ = NULL;
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp22_ = column;
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp23_ = column_name;
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp20_ = g_strcmp0 (_tmp22_, _tmp23_) == 0;
-#line 1936 "DatabaseTable.c"
+#line 1963 "DatabaseTable.c"
} else {
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp20_ = FALSE;
-#line 1940 "DatabaseTable.c"
+#line 1967 "DatabaseTable.c"
}
-#line 315 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp20_) {
-#line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = TRUE;
-#line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (column);
-#line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 1952 "DatabaseTable.c"
+#line 1979 "DatabaseTable.c"
}
-#line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (column);
-#line 1956 "DatabaseTable.c"
+#line 1983 "DatabaseTable.c"
}
}
}
}
-#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = FALSE;
-#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 1967 "DatabaseTable.c"
+#line 1994 "DatabaseTable.c"
}
@@ -1981,45 +2008,45 @@ gboolean database_table_has_table (const gchar* table_name) {
gint _tmp7_ = 0;
gint _tmp8_ = 0;
gint _tmp9_ = 0;
-#line 323 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 327 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (table_name != NULL, FALSE);
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = database_table_db;
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = table_name;
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = g_strdup_printf ("PRAGMA table_info(%s)", _tmp1_);
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = _tmp2_;
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL);
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
stmt = _tmp4_;
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = _tmp5_;
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp3_);
-#line 325 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 329 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp6_;
-#line 326 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = res;
-#line 326 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 328 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 332 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = sqlite3_step (stmt);
-#line 328 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 332 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp8_;
-#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = res;
-#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = _tmp9_ != SQLITE_DONE;
-#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 330 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 2023 "DatabaseTable.c"
+#line 2050 "DatabaseTable.c"
}
@@ -2040,86 +2067,86 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column
sqlite3_stmt* _tmp10_ = NULL;
gint _tmp11_ = 0;
gint _tmp12_ = 0;
-#line 333 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (table_name != NULL, FALSE);
-#line 333 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (column_name != NULL, FALSE);
-#line 333 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (column_constraints != NULL, FALSE);
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = database_table_db;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = table_name;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = column_name;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = column_constraints;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp4_ = g_strdup_printf ("ALTER TABLE %s ADD COLUMN %s %s", _tmp1_, _tmp2_, _tmp3_);
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = _tmp4_;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = sqlite3_prepare_v2 (_tmp0_, _tmp5_, -1, &_tmp6_, NULL);
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
stmt = _tmp6_;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = _tmp7_;
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp5_);
-#line 335 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp8_;
-#line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = res;
-#line 337 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp10_ = stmt;
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp11_ = sqlite3_step (_tmp10_);
-#line 339 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 343 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp11_;
-#line 340 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp12_ = res;
-#line 340 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp12_ != SQLITE_DONE) {
-#line 2088 "DatabaseTable.c"
+#line 2115 "DatabaseTable.c"
const gchar* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
const gchar* _tmp15_ = NULL;
gint _tmp16_ = 0;
sqlite3* _tmp17_ = NULL;
const gchar* _tmp18_ = NULL;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp13_ = table_name;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp14_ = column_name;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp15_ = column_constraints;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp16_ = res;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp17_ = database_table_db;
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp18_ = sqlite3_errmsg (_tmp17_);
-#line 341 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
- g_critical ("DatabaseTable.vala:341: Unable to add column %s %s %s: (%d) %s", _tmp13_, _tmp14_, _tmp15_, _tmp16_, _tmp18_);
-#line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ g_critical ("DatabaseTable.vala:345: Unable to add column %s %s %s: (%d) %s", _tmp13_, _tmp14_, _tmp15_, _tmp16_, _tmp18_);
+#line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = FALSE;
-#line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 2115 "DatabaseTable.c"
+#line 2142 "DatabaseTable.c"
}
-#line 347 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = TRUE;
-#line 347 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 347 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 2123 "DatabaseTable.c"
+#line 2150 "DatabaseTable.c"
}
@@ -2133,62 +2160,62 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col
const gchar* _tmp8_ = NULL;
const gchar* _tmp9_ = NULL;
gboolean _tmp10_ = FALSE;
-#line 353 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (table_name != NULL, FALSE);
-#line 353 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (column_name != NULL, FALSE);
-#line 353 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (column_constraints != NULL, FALSE);
-#line 353 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 357 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (upgrade_msg != NULL, FALSE);
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = table_name;
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = database_table_has_table (_tmp1_);
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (!_tmp2_) {
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = TRUE;
-#line 2153 "DatabaseTable.c"
+#line 2180 "DatabaseTable.c"
} else {
const gchar* _tmp3_ = NULL;
const gchar* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = table_name;
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp4_ = column_name;
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = database_table_has_column (_tmp3_, _tmp4_);
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = _tmp5_;
-#line 2166 "DatabaseTable.c"
+#line 2193 "DatabaseTable.c"
}
-#line 355 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp0_) {
-#line 356 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = TRUE;
-#line 356 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 2174 "DatabaseTable.c"
+#line 2201 "DatabaseTable.c"
}
-#line 358 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 362 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = upgrade_msg;
-#line 358 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
- g_message ("DatabaseTable.vala:358: %s", _tmp6_);
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 362 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ g_message ("DatabaseTable.vala:362: %s", _tmp6_);
+#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = table_name;
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = column_name;
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = column_constraints;
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp10_ = database_table_add_column (_tmp7_, _tmp8_, _tmp9_);
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = _tmp10_;
-#line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 2192 "DatabaseTable.c"
+#line 2219 "DatabaseTable.c"
}
@@ -2209,76 +2236,76 @@ gint database_table_get_row_count (DatabaseTable* self) {
gint _tmp10_ = 0;
sqlite3_stmt* _tmp15_ = NULL;
gint _tmp16_ = 0;
-#line 363 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 367 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_return_val_if_fail (IS_DATABASE_TABLE (self), 0);
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = database_table_db;
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = self->table_name;
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = g_strdup_printf ("SELECT COUNT(id) AS RowCount FROM %s", _tmp1_);
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = _tmp2_;
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = sqlite3_prepare_v2 (_tmp0_, _tmp3_, -1, &_tmp4_, NULL);
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
stmt = _tmp4_;
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = _tmp5_;
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (_tmp3_);
-#line 365 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp6_;
-#line 366 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp7_ = res;
-#line 366 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 368 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp8_ = stmt;
-#line 368 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp9_ = sqlite3_step (_tmp8_);
-#line 368 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp9_;
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 373 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp10_ = res;
-#line 369 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 373 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp10_ != SQLITE_ROW) {
-#line 2249 "DatabaseTable.c"
+#line 2276 "DatabaseTable.c"
const gchar* _tmp11_ = NULL;
gint _tmp12_ = 0;
sqlite3* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
-#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp11_ = self->table_name;
-#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp12_ = res;
-#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp13_ = database_table_db;
-#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp14_ = sqlite3_errmsg (_tmp13_);
-#line 370 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
- g_critical ("DatabaseTable.vala:370: Unable to retrieve row count on %s: (%d) %s", _tmp11_, _tmp12_, _tmp14_);
-#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 374 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+ g_critical ("DatabaseTable.vala:374: Unable to retrieve row count on %s: (%d) %s", _tmp11_, _tmp12_, _tmp14_);
+#line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = 0;
-#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 372 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 2270 "DatabaseTable.c"
+#line 2297 "DatabaseTable.c"
}
-#line 375 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp15_ = stmt;
-#line 375 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp16_ = sqlite3_column_int (_tmp15_, 0);
-#line 375 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
result = _tmp16_;
-#line 375 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_sqlite3_finalize0 (stmt);
-#line 375 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return result;
-#line 2282 "DatabaseTable.c"
+#line 2309 "DatabaseTable.c"
}
@@ -2288,27 +2315,27 @@ void database_table_begin_transaction (void) {
sqlite3* _tmp1_ = NULL;
gint _tmp2_ = 0;
gint _tmp3_ = 0;
-#line 380 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = database_table_in_transaction;
-#line 380 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_in_transaction = _tmp0_ + 1;
-#line 380 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp0_ != 0) {
-#line 381 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 385 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 2300 "DatabaseTable.c"
+#line 2327 "DatabaseTable.c"
}
-#line 383 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = database_table_db;
-#line 383 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = _sqlite3_exec (_tmp1_, "BEGIN TRANSACTION", NULL, NULL, NULL);
-#line 383 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp2_;
-#line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 388 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = res;
-#line 384 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 388 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 2312 "DatabaseTable.c"
+#line 2339 "DatabaseTable.c"
}
@@ -2321,55 +2348,55 @@ void database_table_commit_transaction (GError** error) {
gint _tmp4_ = 0;
gint _tmp5_ = 0;
GError * _inner_error_ = NULL;
-#line 389 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp0_ = database_table_in_transaction;
-#line 389 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_vala_assert (_tmp0_ > 0, "in_transaction > 0");
-#line 390 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp1_ = database_table_in_transaction;
-#line 390 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_in_transaction = _tmp1_ - 1;
-#line 390 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp2_ = database_table_in_transaction;
-#line 390 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp2_ != 0) {
-#line 391 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 2339 "DatabaseTable.c"
+#line 2366 "DatabaseTable.c"
}
-#line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp3_ = database_table_db;
-#line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp4_ = _sqlite3_exec (_tmp3_, "COMMIT TRANSACTION", NULL, NULL, NULL);
-#line 393 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
res = _tmp4_;
-#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 398 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp5_ = res;
-#line 394 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 398 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_tmp5_ != SQLITE_DONE) {
-#line 2351 "DatabaseTable.c"
+#line 2378 "DatabaseTable.c"
gint _tmp6_ = 0;
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_tmp6_ = res;
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_throw_error ("commit_transaction", _tmp6_, &_inner_error_);
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (_inner_error_->domain == DATABASE_ERROR) {
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_propagate_error (error, _inner_error_);
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 2365 "DatabaseTable.c"
+#line 2392 "DatabaseTable.c"
} else {
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_clear_error (&_inner_error_);
-#line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return;
-#line 2373 "DatabaseTable.c"
+#line 2400 "DatabaseTable.c"
}
}
}
@@ -2382,14 +2409,14 @@ DatabaseTable* database_table_construct (GType object_type) {
self = (DatabaseTable*) g_type_create_instance (object_type);
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return self;
-#line 2386 "DatabaseTable.c"
+#line 2413 "DatabaseTable.c"
}
static void value_database_table_init (GValue* value) {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
value->data[0].v_pointer = NULL;
-#line 2393 "DatabaseTable.c"
+#line 2420 "DatabaseTable.c"
}
@@ -2398,7 +2425,7 @@ static void value_database_table_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_unref (value->data[0].v_pointer);
-#line 2402 "DatabaseTable.c"
+#line 2429 "DatabaseTable.c"
}
}
@@ -2408,11 +2435,11 @@ static void value_database_table_copy_value (const GValue* src_value, GValue* de
if (src_value->data[0].v_pointer) {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
dest_value->data[0].v_pointer = database_table_ref (src_value->data[0].v_pointer);
-#line 2412 "DatabaseTable.c"
+#line 2439 "DatabaseTable.c"
} else {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2416 "DatabaseTable.c"
+#line 2443 "DatabaseTable.c"
}
}
@@ -2420,37 +2447,37 @@ static void value_database_table_copy_value (const GValue* src_value, GValue* de
static gpointer value_database_table_peek_pointer (const GValue* value) {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return value->data[0].v_pointer;
-#line 2424 "DatabaseTable.c"
+#line 2451 "DatabaseTable.c"
}
static gchar* value_database_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (collect_values[0].v_pointer) {
-#line 2431 "DatabaseTable.c"
+#line 2458 "DatabaseTable.c"
DatabaseTable* object;
object = collect_values[0].v_pointer;
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (object->parent_instance.g_class == NULL) {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2438 "DatabaseTable.c"
+#line 2465 "DatabaseTable.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.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 2442 "DatabaseTable.c"
+#line 2469 "DatabaseTable.c"
}
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
value->data[0].v_pointer = database_table_ref (object);
-#line 2446 "DatabaseTable.c"
+#line 2473 "DatabaseTable.c"
} else {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
value->data[0].v_pointer = NULL;
-#line 2450 "DatabaseTable.c"
+#line 2477 "DatabaseTable.c"
}
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return NULL;
-#line 2454 "DatabaseTable.c"
+#line 2481 "DatabaseTable.c"
}
@@ -2461,25 +2488,25 @@ static gchar* value_database_table_lcopy_value (const GValue* value, guint n_col
if (!object_p) {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2465 "DatabaseTable.c"
+#line 2492 "DatabaseTable.c"
}
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (!value->data[0].v_pointer) {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
*object_p = NULL;
-#line 2471 "DatabaseTable.c"
+#line 2498 "DatabaseTable.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
*object_p = value->data[0].v_pointer;
-#line 2475 "DatabaseTable.c"
+#line 2502 "DatabaseTable.c"
} else {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
*object_p = database_table_ref (value->data[0].v_pointer);
-#line 2479 "DatabaseTable.c"
+#line 2506 "DatabaseTable.c"
}
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return NULL;
-#line 2483 "DatabaseTable.c"
+#line 2510 "DatabaseTable.c"
}
@@ -2493,7 +2520,7 @@ GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, con
G_PARAM_SPEC (spec)->value_type = object_type;
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return G_PARAM_SPEC (spec);
-#line 2497 "DatabaseTable.c"
+#line 2524 "DatabaseTable.c"
}
@@ -2502,7 +2529,7 @@ gpointer value_get_database_table (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE), NULL);
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return value->data[0].v_pointer;
-#line 2506 "DatabaseTable.c"
+#line 2533 "DatabaseTable.c"
}
@@ -2522,17 +2549,17 @@ void value_set_database_table (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_ref (value->data[0].v_pointer);
-#line 2526 "DatabaseTable.c"
+#line 2553 "DatabaseTable.c"
} else {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
value->data[0].v_pointer = NULL;
-#line 2530 "DatabaseTable.c"
+#line 2557 "DatabaseTable.c"
}
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (old) {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_unref (old);
-#line 2536 "DatabaseTable.c"
+#line 2563 "DatabaseTable.c"
}
}
@@ -2551,17 +2578,17 @@ void value_take_database_table (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
value->data[0].v_pointer = v_object;
-#line 2555 "DatabaseTable.c"
+#line 2582 "DatabaseTable.c"
} else {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
value->data[0].v_pointer = NULL;
-#line 2559 "DatabaseTable.c"
+#line 2586 "DatabaseTable.c"
}
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
if (old) {
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
database_table_unref (old);
-#line 2565 "DatabaseTable.c"
+#line 2592 "DatabaseTable.c"
}
}
@@ -2571,7 +2598,7 @@ static void database_table_class_init (DatabaseTableClass * klass) {
database_table_parent_class = g_type_class_peek_parent (klass);
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
((DatabaseTableClass *) klass)->finalize = database_table_finalize;
-#line 2575 "DatabaseTable.c"
+#line 2602 "DatabaseTable.c"
}
@@ -2580,7 +2607,7 @@ static void database_table_instance_init (DatabaseTable * self) {
self->table_name = NULL;
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
self->ref_count = 1;
-#line 2584 "DatabaseTable.c"
+#line 2611 "DatabaseTable.c"
}
@@ -2592,7 +2619,7 @@ static void database_table_finalize (DatabaseTable* obj) {
g_signal_handlers_destroy (self);
#line 30 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
_g_free0 (self->table_name);
-#line 2596 "DatabaseTable.c"
+#line 2623 "DatabaseTable.c"
}
@@ -2617,7 +2644,7 @@ gpointer database_table_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
return instance;
-#line 2621 "DatabaseTable.c"
+#line 2648 "DatabaseTable.c"
}
@@ -2630,7 +2657,7 @@ void database_table_unref (gpointer instance) {
DATABASE_TABLE_GET_CLASS (self)->finalize (self);
#line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2634 "DatabaseTable.c"
+#line 2661 "DatabaseTable.c"
}
}
diff --git a/src/db/DatabaseTable.vala b/src/db/DatabaseTable.vala
index 09c026f..4fc8853 100644
--- a/src/db/DatabaseTable.vala
+++ b/src/db/DatabaseTable.vala
@@ -49,9 +49,13 @@ public abstract class DatabaseTable {
e.message));
}
}
-#if SQLITE_DEBUG
- db.trace (on_trace);
-#endif
+
+ unowned string? sql_debug = Environment.get_variable
+ ("SHOTWELL_SQL_DEBUG");
+
+ if (sql_debug != "") {
+ db.trace (on_trace);
+ }
}
public static void on_trace (string message) {
diff --git a/src/db/Db.c b/src/db/Db.c
index 9c7e328..72c8f32 100644
--- a/src/db/Db.c
+++ b/src/db/Db.c
@@ -1,4 +1,4 @@
-/* Db.c generated by valac 0.32.1, the Vala compiler
+/* Db.c generated by valac 0.34.1, the Vala compiler
* generated from Db.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/EventTable.c b/src/db/EventTable.c
index 0e763e9..08f6ba3 100644
--- a/src/db/EventTable.c
+++ b/src/db/EventTable.c
@@ -1,4 +1,4 @@
-/* EventTable.c generated by valac 0.32.1, the Vala compiler
+/* EventTable.c generated by valac 0.34.1, the Vala compiler
* generated from EventTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c
index 42ed64a..e88ee47 100644
--- a/src/db/PhotoTable.c
+++ b/src/db/PhotoTable.c
@@ -1,4 +1,4 @@
-/* PhotoTable.c generated by valac 0.32.1, the Vala compiler
+/* PhotoTable.c generated by valac 0.34.1, the Vala compiler
* generated from PhotoTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/SavedSearchDBTable.c b/src/db/SavedSearchDBTable.c
index 1747d47..1bce91d 100644
--- a/src/db/SavedSearchDBTable.c
+++ b/src/db/SavedSearchDBTable.c
@@ -1,4 +1,4 @@
-/* SavedSearchDBTable.c generated by valac 0.32.1, the Vala compiler
+/* SavedSearchDBTable.c generated by valac 0.34.1, the Vala compiler
* generated from SavedSearchDBTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/TagTable.c b/src/db/TagTable.c
index 1c58788..ef78a70 100644
--- a/src/db/TagTable.c
+++ b/src/db/TagTable.c
@@ -1,4 +1,4 @@
-/* TagTable.c generated by valac 0.32.1, the Vala compiler
+/* TagTable.c generated by valac 0.34.1, the Vala compiler
* generated from TagTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -645,11 +645,11 @@ static gpointer _g_object_ref0 (gpointer self) {
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
#line 655 "TagTable.c"
{
@@ -664,73 +664,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 686 "TagTable.c"
goto __catch19_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 695 "TagTable.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 711 "TagTable.c"
goto __catch19_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 722 "TagTable.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 736 "TagTable.c"
}
@@ -738,24 +738,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
__catch19_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
#line 750 "TagTable.c"
}
__finally19:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 761 "TagTable.c"
}
@@ -2013,15 +2013,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2025 "TagTable.c"
}
diff --git a/src/db/TombstoneTable.c b/src/db/TombstoneTable.c
index 542e568..e92f9a5 100644
--- a/src/db/TombstoneTable.c
+++ b/src/db/TombstoneTable.c
@@ -1,4 +1,4 @@
-/* TombstoneTable.c generated by valac 0.32.1, the Vala compiler
+/* TombstoneTable.c generated by valac 0.34.1, the Vala compiler
* generated from TombstoneTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/VersionTable.c b/src/db/VersionTable.c
index fa79d52..c65621b 100644
--- a/src/db/VersionTable.c
+++ b/src/db/VersionTable.c
@@ -1,4 +1,4 @@
-/* VersionTable.c generated by valac 0.32.1, the Vala compiler
+/* VersionTable.c generated by valac 0.34.1, the Vala compiler
* generated from VersionTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/db/VideoTable.c b/src/db/VideoTable.c
index 8b8d78a..7d5c06e 100644
--- a/src/db/VideoTable.c
+++ b/src/db/VideoTable.c
@@ -1,4 +1,4 @@
-/* VideoTable.c generated by valac 0.32.1, the Vala compiler
+/* VideoTable.c generated by valac 0.34.1, the Vala compiler
* generated from VideoTable.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/Direct.c b/src/direct/Direct.c
index 2e1bfa4..91704cf 100644
--- a/src/direct/Direct.c
+++ b/src/direct/Direct.c
@@ -1,4 +1,4 @@
-/* Direct.c generated by valac 0.32.1, the Vala compiler
+/* Direct.c generated by valac 0.34.1, the Vala compiler
* generated from Direct.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index 97ebcd5..5fe58c0 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -1,4 +1,4 @@
-/* DirectPhoto.c generated by valac 0.32.1, the Vala compiler
+/* DirectPhoto.c generated by valac 0.34.1, the Vala compiler
* generated from DirectPhoto.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c
index c9094a2..d837f7d 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -1,4 +1,4 @@
-/* DirectPhotoPage.c generated by valac 0.32.1, the Vala compiler
+/* DirectPhotoPage.c generated by valac 0.34.1, the Vala compiler
* generated from DirectPhotoPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/DirectView.c b/src/direct/DirectView.c
index e3cebb7..d829231 100644
--- a/src/direct/DirectView.c
+++ b/src/direct/DirectView.c
@@ -1,4 +1,4 @@
-/* DirectView.c generated by valac 0.32.1, the Vala compiler
+/* DirectView.c generated by valac 0.34.1, the Vala compiler
* generated from DirectView.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c
index dcba026..cafd55d 100644
--- a/src/direct/DirectWindow.c
+++ b/src/direct/DirectWindow.c
@@ -1,4 +1,4 @@
-/* DirectWindow.c generated by valac 0.32.1, the Vala compiler
+/* DirectWindow.c generated by valac 0.34.1, the Vala compiler
* generated from DirectWindow.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c
index ffb8d35..7c01aaa 100644
--- a/src/editing_tools/EditingTools.c
+++ b/src/editing_tools/EditingTools.c
@@ -1,4 +1,4 @@
-/* EditingTools.c generated by valac 0.32.1, the Vala compiler
+/* EditingTools.c generated by valac 0.34.1, the Vala compiler
* generated from EditingTools.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -6742,15 +6742,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 6756 "EditingTools.c"
}
diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c
index 14b6c61..b36afaf 100644
--- a/src/editing_tools/StraightenTool.c
+++ b/src/editing_tools/StraightenTool.c
@@ -1,4 +1,4 @@
-/* StraightenTool.c generated by valac 0.32.1, the Vala compiler
+/* StraightenTool.c generated by valac 0.34.1, the Vala compiler
* generated from StraightenTool.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/Branch.c b/src/events/Branch.c
index 193a8ee..af0e202 100644
--- a/src/events/Branch.c
+++ b/src/events/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.1, the Vala compiler
* generated from Branch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2140,13 +2140,13 @@ static void events_branch_on_no_event_collection_altered (EventsBranch* self) {
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return;
#line 2152 "Branch.c"
}
@@ -2173,35 +2173,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* _tmp3_ = NULL;
gint _tmp3__length1 = 0;
gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2207 "Branch.c"
}
diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c
index f63d633..5f70718 100644
--- a/src/events/EventDirectoryItem.c
+++ b/src/events/EventDirectoryItem.c
@@ -1,4 +1,4 @@
-/* EventDirectoryItem.c generated by valac 0.32.1, the Vala compiler
+/* EventDirectoryItem.c generated by valac 0.34.1, the Vala compiler
* generated from EventDirectoryItem.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/EventPage.c b/src/events/EventPage.c
index afe2a26..492b7a6 100644
--- a/src/events/EventPage.c
+++ b/src/events/EventPage.c
@@ -1,4 +1,4 @@
-/* EventPage.c generated by valac 0.32.1, the Vala compiler
+/* EventPage.c generated by valac 0.34.1, the Vala compiler
* generated from EventPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/Events.c b/src/events/Events.c
index d99ab32..5a36d5c 100644
--- a/src/events/Events.c
+++ b/src/events/Events.c
@@ -1,4 +1,4 @@
-/* Events.c generated by valac 0.32.1, the Vala compiler
+/* Events.c generated by valac 0.34.1, the Vala compiler
* generated from Events.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c
index 6e24584..f4f08e0 100644
--- a/src/events/EventsDirectoryPage.c
+++ b/src/events/EventsDirectoryPage.c
@@ -1,4 +1,4 @@
-/* EventsDirectoryPage.c generated by valac 0.32.1, the Vala compiler
+/* EventsDirectoryPage.c generated by valac 0.34.1, the Vala compiler
* generated from EventsDirectoryPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2446,17 +2446,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2462 "EventsDirectoryPage.c"
}
@@ -2808,35 +2808,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* _tmp3_ = NULL;
gint _tmp3__length1 = 0;
gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2842 "EventsDirectoryPage.c"
}
@@ -3024,13 +3024,13 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return;
#line 3036 "EventsDirectoryPage.c"
}
diff --git a/src/folders/Branch.c b/src/folders/Branch.c
index 7736860..469846b 100644
--- a/src/folders/Branch.c
+++ b/src/folders/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.1, the Vala compiler
* generated from Branch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/folders/Folders.c b/src/folders/Folders.c
index d9af95a..c285978 100644
--- a/src/folders/Folders.c
+++ b/src/folders/Folders.c
@@ -1,4 +1,4 @@
-/* Folders.c generated by valac 0.32.1, the Vala compiler
+/* Folders.c generated by valac 0.34.1, the Vala compiler
* generated from Folders.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/folders/Page.c b/src/folders/Page.c
index ea722a3..65d265b 100644
--- a/src/folders/Page.c
+++ b/src/folders/Page.c
@@ -1,4 +1,4 @@
-/* Page.c generated by valac 0.32.1, the Vala compiler
+/* Page.c generated by valac 0.34.1, the Vala compiler
* generated from Page.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/Branch.c b/src/library/Branch.c
index 136c058..27f51f8 100644
--- a/src/library/Branch.c
+++ b/src/library/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.1, the Vala compiler
* generated from Branch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c
index c1b3a48..2e3ddde 100644
--- a/src/library/FlaggedPage.c
+++ b/src/library/FlaggedPage.c
@@ -1,4 +1,4 @@
-/* FlaggedPage.c generated by valac 0.32.1, the Vala compiler
+/* FlaggedPage.c generated by valac 0.34.1, the Vala compiler
* generated from FlaggedPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/FlaggedSidebarEntry.c b/src/library/FlaggedSidebarEntry.c
index 7eb90aa..8067bd7 100644
--- a/src/library/FlaggedSidebarEntry.c
+++ b/src/library/FlaggedSidebarEntry.c
@@ -1,4 +1,4 @@
-/* FlaggedSidebarEntry.c generated by valac 0.32.1, the Vala compiler
+/* FlaggedSidebarEntry.c generated by valac 0.34.1, the Vala compiler
* generated from FlaggedSidebarEntry.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c
index 2ba5e74..2fba690 100644
--- a/src/library/ImportQueuePage.c
+++ b/src/library/ImportQueuePage.c
@@ -1,4 +1,4 @@
-/* ImportQueuePage.c generated by valac 0.32.1, the Vala compiler
+/* ImportQueuePage.c generated by valac 0.34.1, the Vala compiler
* generated from ImportQueuePage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c
index d7077e5..5ce68ec 100644
--- a/src/library/ImportQueueSidebarEntry.c
+++ b/src/library/ImportQueueSidebarEntry.c
@@ -1,4 +1,4 @@
-/* ImportQueueSidebarEntry.c generated by valac 0.32.1, the Vala compiler
+/* ImportQueueSidebarEntry.c generated by valac 0.34.1, the Vala compiler
* generated from ImportQueueSidebarEntry.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c
index d0f8f24..93f2225 100644
--- a/src/library/LastImportPage.c
+++ b/src/library/LastImportPage.c
@@ -1,4 +1,4 @@
-/* LastImportPage.c generated by valac 0.32.1, the Vala compiler
+/* LastImportPage.c generated by valac 0.34.1, the Vala compiler
* generated from LastImportPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/LastImportSidebarEntry.c b/src/library/LastImportSidebarEntry.c
index bdf6b91..c1713c7 100644
--- a/src/library/LastImportSidebarEntry.c
+++ b/src/library/LastImportSidebarEntry.c
@@ -1,4 +1,4 @@
-/* LastImportSidebarEntry.c generated by valac 0.32.1, the Vala compiler
+/* LastImportSidebarEntry.c generated by valac 0.34.1, the Vala compiler
* generated from LastImportSidebarEntry.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/Library.c b/src/library/Library.c
index 4ce5d56..68166f0 100644
--- a/src/library/Library.c
+++ b/src/library/Library.c
@@ -1,4 +1,4 @@
-/* Library.c generated by valac 0.32.1, the Vala compiler
+/* Library.c generated by valac 0.34.1, the Vala compiler
* generated from Library.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index 9c5d335..2ef18d9 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -1,4 +1,4 @@
-/* LibraryWindow.c generated by valac 0.32.1, the Vala compiler
+/* LibraryWindow.c generated by valac 0.34.1, the Vala compiler
* generated from LibraryWindow.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -9951,11 +9951,11 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
#line 9960 "LibraryWindow.c"
{
@@ -9970,73 +9970,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 9991 "LibraryWindow.c"
goto __catch41_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 10000 "LibraryWindow.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 10016 "LibraryWindow.c"
goto __catch41_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 10027 "LibraryWindow.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 10041 "LibraryWindow.c"
}
@@ -10044,24 +10044,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
__catch41_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
#line 10055 "LibraryWindow.c"
}
__finally41:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 10066 "LibraryWindow.c"
}
diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c
index df2b7c6..dacbda6 100644
--- a/src/library/OfflinePage.c
+++ b/src/library/OfflinePage.c
@@ -1,4 +1,4 @@
-/* OfflinePage.c generated by valac 0.32.1, the Vala compiler
+/* OfflinePage.c generated by valac 0.34.1, the Vala compiler
* generated from OfflinePage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/OfflineSidebarEntry.c b/src/library/OfflineSidebarEntry.c
index a2025d1..048774d 100644
--- a/src/library/OfflineSidebarEntry.c
+++ b/src/library/OfflineSidebarEntry.c
@@ -1,4 +1,4 @@
-/* OfflineSidebarEntry.c generated by valac 0.32.1, the Vala compiler
+/* OfflineSidebarEntry.c generated by valac 0.34.1, the Vala compiler
* generated from OfflineSidebarEntry.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c
index 000b8b5..1d51ff5 100644
--- a/src/library/TrashPage.c
+++ b/src/library/TrashPage.c
@@ -1,4 +1,4 @@
-/* TrashPage.c generated by valac 0.32.1, the Vala compiler
+/* TrashPage.c generated by valac 0.34.1, the Vala compiler
* generated from TrashPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/library/TrashSidebarEntry.c b/src/library/TrashSidebarEntry.c
index 0346c07..ab8fd8f 100644
--- a/src/library/TrashSidebarEntry.c
+++ b/src/library/TrashSidebarEntry.c
@@ -1,4 +1,4 @@
-/* TrashSidebarEntry.c generated by valac 0.32.1, the Vala compiler
+/* TrashSidebarEntry.c generated by valac 0.34.1, the Vala compiler
* generated from TrashSidebarEntry.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/main.c b/src/main.c
index bef5186..8d1726b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,4 @@
-/* main.c generated by valac 0.32.1, the Vala compiler
+/* main.c generated by valac 0.34.1, the Vala compiler
* generated from main.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -381,6 +381,7 @@ typedef struct _ImportUIQuestionParamsClass ImportUIQuestionParamsClass;
typedef struct _DirectWindow DirectWindow;
typedef struct _DirectWindowClass DirectWindowClass;
+#define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL)))
#define _g_timer_destroy0(var) ((var == NULL) ? NULL : (var = (g_timer_destroy (var), NULL)))
typedef enum {
@@ -698,7 +699,7 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
#line 114 "/home/jens/Source/shotwell/src/main.vala"
return result;
-#line 702 "main.c"
+#line 703 "main.c"
}
@@ -707,14 +708,14 @@ static gboolean _aggregate_progress_monitor_monitor_progress_monitor (guint64 cu
result = aggregate_progress_monitor_monitor ((AggregateProgressMonitor*) self, current, total);
#line 115 "/home/jens/Source/shotwell/src/main.vala"
return result;
-#line 711 "main.c"
+#line 712 "main.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 185 "/home/jens/Source/shotwell/src/main.vala"
return self ? g_object_ref (self) : NULL;
-#line 718 "main.c"
+#line 719 "main.c"
}
@@ -798,7 +799,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp1_ = was_already_running;
#line 18 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp1_) {
-#line 802 "main.c"
+#line 803 "main.c"
gchar** _tmp2_ = NULL;
gint _tmp2__length1 = 0;
#line 25 "/home/jens/Source/shotwell/src/main.vala"
@@ -811,7 +812,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
application_send_to_primary_instance (_tmp2_, _tmp2__length1);
#line 27 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 815 "main.c"
+#line 816 "main.c"
}
#line 31 "/home/jens/Source/shotwell/src/main.vala"
_tmp3_ = app_dirs_get_data_subdir ("data", NULL);
@@ -827,13 +828,13 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_object_unref0 (_tmp6_);
#line 31 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (_tmp4_);
-#line 831 "main.c"
+#line 832 "main.c"
{
#line 35 "/home/jens/Source/shotwell/src/main.vala"
library_app_init (&_inner_error_);
#line 35 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 837 "main.c"
+#line 838 "main.c"
goto __catch206_g_error;
}
}
@@ -857,7 +858,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_error_free0 (err);
#line 39 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 861 "main.c"
+#line 862 "main.c"
}
__finally206:
#line 34 "/home/jens/Source/shotwell/src/main.vala"
@@ -868,7 +869,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
g_clear_error (&_inner_error_);
#line 34 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 872 "main.c"
+#line 873 "main.c"
}
#line 43 "/home/jens/Source/shotwell/src/main.vala"
g_message ("main.vala:43: Verifying database ...");
@@ -890,15 +891,15 @@ void library_exec (gchar** mounts, int mounts_length1) {
switch (_tmp12_) {
#line 48 "/home/jens/Source/shotwell/src/main.vala"
case DB_VERIFY_RESULT_OK:
-#line 894 "main.c"
+#line 895 "main.c"
{
#line 51 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 898 "main.c"
+#line 899 "main.c"
}
#line 48 "/home/jens/Source/shotwell/src/main.vala"
case DB_VERIFY_RESULT_FUTURE_VERSION:
-#line 902 "main.c"
+#line 903 "main.c"
{
const gchar* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
@@ -920,11 +921,11 @@ void library_exec (gchar** mounts, int mounts_length1) {
errormsg = _tmp16_;
#line 56 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 922 "main.c"
+#line 923 "main.c"
}
#line 48 "/home/jens/Source/shotwell/src/main.vala"
case DB_VERIFY_RESULT_UPGRADE_ERROR:
-#line 926 "main.c"
+#line 927 "main.c"
{
const gchar* _tmp17_ = NULL;
const gchar* _tmp18_ = NULL;
@@ -946,11 +947,11 @@ void library_exec (gchar** mounts, int mounts_length1) {
errormsg = _tmp20_;
#line 62 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 946 "main.c"
+#line 947 "main.c"
}
#line 48 "/home/jens/Source/shotwell/src/main.vala"
case DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE:
-#line 950 "main.c"
+#line 951 "main.c"
{
const gchar* _tmp21_ = NULL;
const gchar* _tmp22_ = NULL;
@@ -989,7 +990,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_object_unref0 (_tmp25_);
#line 68 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 986 "main.c"
+#line 987 "main.c"
}
default:
{
@@ -1011,14 +1012,14 @@ void library_exec (gchar** mounts, int mounts_length1) {
errormsg = _tmp32_;
#line 73 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 1008 "main.c"
+#line 1009 "main.c"
}
}
#line 76 "/home/jens/Source/shotwell/src/main.vala"
_tmp33_ = errormsg;
#line 76 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp33_ != NULL) {
-#line 1015 "main.c"
+#line 1016 "main.c"
GtkMessageDialog* dialog = NULL;
const gchar* _tmp34_ = NULL;
GtkMessageDialog* _tmp35_ = NULL;
@@ -1055,7 +1056,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_free0 (errormsg);
#line 85 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1052 "main.c"
+#line 1053 "main.c"
}
#line 88 "/home/jens/Source/shotwell/src/main.vala"
upgrades_init ();
@@ -1073,7 +1074,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp39_ = commandline_options_no_startup_progress;
#line 94 "/home/jens/Source/shotwell/src/main.vala"
if (!_tmp39_) {
-#line 1070 "main.c"
+#line 1071 "main.c"
guint64 grand_total = 0ULL;
PhotoTable* _tmp40_ = NULL;
PhotoTable* _tmp41_ = NULL;
@@ -1140,7 +1141,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp56_ = grand_total;
#line 103 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp56_ > ((guint64) 5000)) {
-#line 1137 "main.c"
+#line 1138 "main.c"
const gchar* _tmp57_ = NULL;
ProgressDialog* _tmp58_ = NULL;
ProgressDialog* _tmp59_ = NULL;
@@ -1167,7 +1168,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp60_ = progress_dialog;
#line 106 "/home/jens/Source/shotwell/src/main.vala"
progress_dialog_set_minimum_on_screen_time_msec (_tmp60_, 250);
-#line 1164 "main.c"
+#line 1165 "main.c"
{
gchar* icon_path = NULL;
GFile* _tmp61_ = NULL;
@@ -1216,7 +1217,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 109 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (icon_path);
-#line 1213 "main.c"
+#line 1214 "main.c"
goto __catch207_g_error;
}
#line 109 "/home/jens/Source/shotwell/src/main.vala"
@@ -1227,7 +1228,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_object_unref0 (_tmp69_);
#line 107 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (icon_path);
-#line 1224 "main.c"
+#line 1225 "main.c"
}
goto __finally207;
__catch207_g_error:
@@ -1248,7 +1249,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
"indow: %s", _tmp74_);
#line 107 "/home/jens/Source/shotwell/src/main.vala"
_g_error_free0 (err);
-#line 1244 "main.c"
+#line 1245 "main.c"
}
__finally207:
#line 107 "/home/jens/Source/shotwell/src/main.vala"
@@ -1275,7 +1276,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
g_clear_error (&_inner_error_);
#line 107 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1271 "main.c"
+#line 1272 "main.c"
}
#line 114 "/home/jens/Source/shotwell/src/main.vala"
_tmp75_ = grand_total;
@@ -1303,7 +1304,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
monitor_target = aggregate_progress_monitor_ref (_tmp78_);
#line 115 "/home/jens/Source/shotwell/src/main.vala"
monitor_target_destroy_notify = aggregate_progress_monitor_unref;
-#line 1299 "main.c"
+#line 1300 "main.c"
}
}
#line 119 "/home/jens/Source/shotwell/src/main.vala"
@@ -1314,13 +1315,13 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp79_ = aggregate_monitor;
#line 122 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp79_ != NULL) {
-#line 1310 "main.c"
+#line 1311 "main.c"
AggregateProgressMonitor* _tmp80_ = NULL;
#line 123 "/home/jens/Source/shotwell/src/main.vala"
_tmp80_ = aggregate_monitor;
#line 123 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp80_, "LibraryPhoto.init");
-#line 1316 "main.c"
+#line 1317 "main.c"
}
#line 124 "/home/jens/Source/shotwell/src/main.vala"
_tmp81_ = monitor;
@@ -1332,13 +1333,13 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp82_ = aggregate_monitor;
#line 125 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp82_ != NULL) {
-#line 1328 "main.c"
+#line 1329 "main.c"
AggregateProgressMonitor* _tmp83_ = NULL;
#line 126 "/home/jens/Source/shotwell/src/main.vala"
_tmp83_ = aggregate_monitor;
#line 126 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp83_, "Video.init");
-#line 1334 "main.c"
+#line 1335 "main.c"
}
#line 127 "/home/jens/Source/shotwell/src/main.vala"
_tmp84_ = monitor;
@@ -1350,13 +1351,13 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp85_ = aggregate_monitor;
#line 128 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp85_ != NULL) {
-#line 1346 "main.c"
+#line 1347 "main.c"
AggregateProgressMonitor* _tmp86_ = NULL;
#line 129 "/home/jens/Source/shotwell/src/main.vala"
_tmp86_ = aggregate_monitor;
#line 129 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp86_, "Upgrades.execute");
-#line 1352 "main.c"
+#line 1353 "main.c"
}
#line 130 "/home/jens/Source/shotwell/src/main.vala"
_tmp87_ = upgrades_get_instance ();
@@ -1390,13 +1391,13 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp94_ = aggregate_monitor;
#line 138 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp94_ != NULL) {
-#line 1386 "main.c"
+#line 1387 "main.c"
AggregateProgressMonitor* _tmp95_ = NULL;
#line 139 "/home/jens/Source/shotwell/src/main.vala"
_tmp95_ = aggregate_monitor;
#line 139 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp95_, "Event.init");
-#line 1392 "main.c"
+#line 1393 "main.c"
}
#line 140 "/home/jens/Source/shotwell/src/main.vala"
_tmp96_ = monitor;
@@ -1408,13 +1409,13 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp97_ = aggregate_monitor;
#line 141 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp97_ != NULL) {
-#line 1404 "main.c"
+#line 1405 "main.c"
AggregateProgressMonitor* _tmp98_ = NULL;
#line 142 "/home/jens/Source/shotwell/src/main.vala"
_tmp98_ = aggregate_monitor;
#line 142 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp98_, "Tag.init");
-#line 1410 "main.c"
+#line 1411 "main.c"
}
#line 143 "/home/jens/Source/shotwell/src/main.vala"
_tmp99_ = monitor;
@@ -1438,13 +1439,13 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp102_ = aggregate_monitor;
#line 151 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp102_ != NULL) {
-#line 1434 "main.c"
+#line 1435 "main.c"
AggregateProgressMonitor* _tmp103_ = NULL;
#line 152 "/home/jens/Source/shotwell/src/main.vala"
_tmp103_ = aggregate_monitor;
#line 152 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp103_, "LibraryWindow");
-#line 1440 "main.c"
+#line 1441 "main.c"
}
#line 153 "/home/jens/Source/shotwell/src/main.vala"
_tmp104_ = monitor;
@@ -1460,13 +1461,13 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp106_ = aggregate_monitor;
#line 155 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp106_ != NULL) {
-#line 1456 "main.c"
+#line 1457 "main.c"
AggregateProgressMonitor* _tmp107_ = NULL;
#line 156 "/home/jens/Source/shotwell/src/main.vala"
_tmp107_ = aggregate_monitor;
#line 156 "/home/jens/Source/shotwell/src/main.vala"
aggregate_progress_monitor_next_step (_tmp107_, "done");
-#line 1462 "main.c"
+#line 1463 "main.c"
}
#line 161 "/home/jens/Source/shotwell/src/main.vala"
(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
@@ -1490,13 +1491,13 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp108_ = progress_dialog;
#line 163 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp108_ != NULL) {
-#line 1486 "main.c"
+#line 1487 "main.c"
ProgressDialog* _tmp109_ = NULL;
#line 164 "/home/jens/Source/shotwell/src/main.vala"
_tmp109_ = progress_dialog;
#line 164 "/home/jens/Source/shotwell/src/main.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_widget_get_type (), GtkWidget));
-#line 1492 "main.c"
+#line 1493 "main.c"
}
#line 165 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (progress_dialog);
@@ -1506,7 +1507,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp110_ = mounts;
#line 168 "/home/jens/Source/shotwell/src/main.vala"
_tmp110__length1 = mounts_length1;
-#line 1502 "main.c"
+#line 1503 "main.c"
{
gchar** mount_collection = NULL;
gint mount_collection_length1 = 0;
@@ -1518,14 +1519,14 @@ void library_exec (gchar** mounts, int mounts_length1) {
mount_collection_length1 = _tmp110__length1;
#line 168 "/home/jens/Source/shotwell/src/main.vala"
for (mount_it = 0; mount_it < _tmp110__length1; mount_it = mount_it + 1) {
-#line 1514 "main.c"
+#line 1515 "main.c"
gchar* _tmp111_ = NULL;
gchar* mount = NULL;
#line 168 "/home/jens/Source/shotwell/src/main.vala"
_tmp111_ = g_strdup (mount_collection[mount_it]);
#line 168 "/home/jens/Source/shotwell/src/main.vala"
mount = _tmp111_;
-#line 1521 "main.c"
+#line 1522 "main.c"
{
LibraryWindow* _tmp112_ = NULL;
const gchar* _tmp113_ = NULL;
@@ -1537,7 +1538,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
library_window_mounted_camera_shell_notification (_tmp112_, _tmp113_, TRUE);
#line 168 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (mount);
-#line 1533 "main.c"
+#line 1534 "main.c"
}
}
}
@@ -1565,7 +1566,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_object_unref0 (_tmp118_);
#line 174 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp120_) {
-#line 1561 "main.c"
+#line 1562 "main.c"
LibraryPhotoSourceCollection* _tmp121_ = NULL;
gint _tmp122_ = 0;
#line 175 "/home/jens/Source/shotwell/src/main.vala"
@@ -1574,15 +1575,15 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp122_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, TYPE_DATA_COLLECTION, DataCollection));
#line 175 "/home/jens/Source/shotwell/src/main.vala"
_tmp116_ = _tmp122_ == 0;
-#line 1570 "main.c"
+#line 1571 "main.c"
} else {
#line 174 "/home/jens/Source/shotwell/src/main.vala"
_tmp116_ = FALSE;
-#line 1574 "main.c"
+#line 1575 "main.c"
}
#line 174 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp116_) {
-#line 1578 "main.c"
+#line 1579 "main.c"
WelcomeDialog* welcome = NULL;
LibraryWindow* _tmp123_ = NULL;
WelcomeDialog* _tmp124_ = NULL;
@@ -1625,7 +1626,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_object_unref0 (_tmp126_);
#line 174 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (welcome);
-#line 1621 "main.c"
+#line 1622 "main.c"
} else {
ConfigFacade* _tmp132_ = NULL;
ConfigFacade* _tmp133_ = NULL;
@@ -1637,7 +1638,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE);
#line 180 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (_tmp133_);
-#line 1633 "main.c"
+#line 1634 "main.c"
}
#line 183 "/home/jens/Source/shotwell/src/main.vala"
_tmp134_ = selected_import_entries;
@@ -1645,7 +1646,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp134__length1 = selected_import_entries_length1;
#line 183 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp134__length1 > 0) {
-#line 1641 "main.c"
+#line 1642 "main.c"
WelcomeServiceEntry** _tmp135_ = NULL;
gint _tmp135__length1 = 0;
#line 184 "/home/jens/Source/shotwell/src/main.vala"
@@ -1654,7 +1655,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
_tmp135_ = selected_import_entries;
#line 185 "/home/jens/Source/shotwell/src/main.vala"
_tmp135__length1 = selected_import_entries_length1;
-#line 1650 "main.c"
+#line 1651 "main.c"
{
WelcomeServiceEntry** entry_collection = NULL;
gint entry_collection_length1 = 0;
@@ -1666,14 +1667,14 @@ void library_exec (gchar** mounts, int mounts_length1) {
entry_collection_length1 = _tmp135__length1;
#line 185 "/home/jens/Source/shotwell/src/main.vala"
for (entry_it = 0; entry_it < _tmp135__length1; entry_it = entry_it + 1) {
-#line 1662 "main.c"
+#line 1663 "main.c"
WelcomeServiceEntry* _tmp136_ = NULL;
WelcomeServiceEntry* entry = NULL;
#line 185 "/home/jens/Source/shotwell/src/main.vala"
_tmp136_ = _g_object_ref0 (entry_collection[entry_it]);
#line 185 "/home/jens/Source/shotwell/src/main.vala"
entry = _tmp136_;
-#line 1669 "main.c"
+#line 1670 "main.c"
{
WelcomeServiceEntry* _tmp137_ = NULL;
#line 186 "/home/jens/Source/shotwell/src/main.vala"
@@ -1682,7 +1683,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
welcome_service_entry_execute (_tmp137_);
#line 185 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (entry);
-#line 1678 "main.c"
+#line 1679 "main.c"
}
}
}
@@ -1693,7 +1694,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
if (_tmp138_) {
#line 192 "/home/jens/Source/shotwell/src/main.vala"
run_system_pictures_import (NULL);
-#line 1689 "main.c"
+#line 1690 "main.c"
}
#line 195 "/home/jens/Source/shotwell/src/main.vala"
_tmp139_ = startup_timer;
@@ -1753,14 +1754,14 @@ void library_exec (gchar** mounts, int mounts_length1) {
_g_free0 (app_version);
#line 15 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (errormsg);
-#line 1749 "main.c"
+#line 1750 "main.c"
}
static void _report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
#line 224 "/home/jens/Source/shotwell/src/main.vala"
report_system_pictures_import (manifest, import_roll);
-#line 1756 "main.c"
+#line 1757 "main.c"
}
@@ -1790,7 +1791,7 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
if (!_tmp0_) {
#line 217 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1786 "main.c"
+#line 1787 "main.c"
}
#line 219 "/home/jens/Source/shotwell/src/main.vala"
_tmp1_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL);
@@ -1840,7 +1841,7 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
_g_object_unref0 (library_window);
#line 215 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (jobs);
-#line 1836 "main.c"
+#line 1837 "main.c"
}
@@ -1856,7 +1857,7 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i
_tmp1_ = do_external_import;
#line 238 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp1_) {
-#line 1852 "main.c"
+#line 1853 "main.c"
ImportManifest* _tmp2_ = NULL;
GeeList* _tmp3_ = NULL;
gint _tmp4_ = 0;
@@ -1871,23 +1872,23 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i
_tmp5_ = _tmp4_;
#line 238 "/home/jens/Source/shotwell/src/main.vala"
_tmp0_ = _tmp5_ == 0;
-#line 1867 "main.c"
+#line 1868 "main.c"
} else {
#line 238 "/home/jens/Source/shotwell/src/main.vala"
_tmp0_ = FALSE;
-#line 1871 "main.c"
+#line 1872 "main.c"
}
#line 238 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp0_) {
#line 239 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1877 "main.c"
+#line 1878 "main.c"
}
#line 241 "/home/jens/Source/shotwell/src/main.vala"
_tmp6_ = manifest;
#line 241 "/home/jens/Source/shotwell/src/main.vala"
import_ui_report_manifest (_tmp6_, TRUE, NULL);
-#line 1883 "main.c"
+#line 1884 "main.c"
}
@@ -1919,13 +1920,13 @@ void editing_exec (const gchar* filename) {
direct_preconfigure (_tmp2_);
#line 249 "/home/jens/Source/shotwell/src/main.vala"
db_preconfigure (NULL);
-#line 1915 "main.c"
+#line 1916 "main.c"
{
#line 253 "/home/jens/Source/shotwell/src/main.vala"
direct_app_init (&_inner_error_);
#line 253 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1921 "main.c"
+#line 1922 "main.c"
goto __catch208_g_error;
}
}
@@ -1951,7 +1952,7 @@ void editing_exec (const gchar* filename) {
_g_object_unref0 (initial_file);
#line 257 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1947 "main.c"
+#line 1948 "main.c"
}
__finally208:
#line 252 "/home/jens/Source/shotwell/src/main.vala"
@@ -1964,7 +1965,7 @@ void editing_exec (const gchar* filename) {
g_clear_error (&_inner_error_);
#line 252 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 1960 "main.c"
+#line 1961 "main.c"
}
#line 261 "/home/jens/Source/shotwell/src/main.vala"
desktop_integration_init ();
@@ -2002,14 +2003,14 @@ void editing_exec (const gchar* filename) {
_g_object_unref0 (direct_window);
#line 244 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (initial_file);
-#line 1998 "main.c"
+#line 1999 "main.c"
}
static GOptionEntry* _vala_array_dup26 (GOptionEntry* self, int length) {
#line 291 "/home/jens/Source/shotwell/src/main.vala"
return g_memdup (self, length * sizeof (GOptionEntry));
-#line 2005 "main.c"
+#line 2006 "main.c"
}
@@ -2020,11 +2021,11 @@ static void _vala_array_add152 (GOptionEntry** array, int* length, int* size, co
*size = (*size) ? (2 * (*size)) : 4;
#line 295 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 2016 "main.c"
+#line 2017 "main.c"
}
#line 295 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 2020 "main.c"
+#line 2021 "main.c"
}
@@ -2035,11 +2036,11 @@ static void _vala_array_add153 (GOptionEntry** array, int* length, int* size, co
*size = (*size) ? (2 * (*size)) : 4;
#line 299 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 2031 "main.c"
+#line 2032 "main.c"
}
#line 299 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 2035 "main.c"
+#line 2036 "main.c"
}
@@ -2050,11 +2051,11 @@ static void _vala_array_add154 (GOptionEntry** array, int* length, int* size, co
*size = (*size) ? (2 * (*size)) : 4;
#line 303 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 2046 "main.c"
+#line 2047 "main.c"
}
#line 303 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 2050 "main.c"
+#line 2051 "main.c"
}
@@ -2065,11 +2066,11 @@ static void _vala_array_add155 (GOptionEntry** array, int* length, int* size, co
*size = (*size) ? (2 * (*size)) : 4;
#line 307 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 2061 "main.c"
+#line 2062 "main.c"
}
#line 307 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 2065 "main.c"
+#line 2066 "main.c"
}
@@ -2080,18 +2081,18 @@ static void _vala_array_add156 (GOptionEntry** array, int* length, int* size, co
*size = (*size) ? (2 * (*size)) : 4;
#line 310 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (GOptionEntry, *array, *size);
-#line 2076 "main.c"
+#line 2077 "main.c"
}
#line 310 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = *value;
-#line 2080 "main.c"
+#line 2081 "main.c"
}
static GOptionEntry* _vala_array_dup27 (GOptionEntry* self, int length) {
#line 312 "/home/jens/Source/shotwell/src/main.vala"
return g_memdup (self, length * sizeof (GOptionEntry));
-#line 2087 "main.c"
+#line 2088 "main.c"
}
@@ -2141,7 +2142,7 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
_tmp0__length1 = commandline_options_entries_length1;
#line 290 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp0_ != NULL) {
-#line 2137 "main.c"
+#line 2138 "main.c"
GOptionEntry* _tmp1_ = NULL;
gint _tmp1__length1 = 0;
GOptionEntry* _tmp2_ = NULL;
@@ -2164,13 +2165,13 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
if (result_length1) {
#line 291 "/home/jens/Source/shotwell/src/main.vala"
*result_length1 = _tmp3__length1;
-#line 2160 "main.c"
+#line 2161 "main.c"
}
#line 291 "/home/jens/Source/shotwell/src/main.vala"
result = _tmp3_;
#line 291 "/home/jens/Source/shotwell/src/main.vala"
return result;
-#line 2166 "main.c"
+#line 2167 "main.c"
}
#line 293 "/home/jens/Source/shotwell/src/main.vala"
_tmp4_ = _ ("Path to Shotwell's private data");
@@ -2318,13 +2319,13 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
if (result_length1) {
#line 312 "/home/jens/Source/shotwell/src/main.vala"
*result_length1 = _tmp26__length1;
-#line 2314 "main.c"
+#line 2315 "main.c"
}
#line 312 "/home/jens/Source/shotwell/src/main.vala"
result = _tmp26_;
#line 312 "/home/jens/Source/shotwell/src/main.vala"
return result;
-#line 2320 "main.c"
+#line 2321 "main.c"
}
@@ -2335,13 +2336,13 @@ static void _vala_array_add157 (gchar*** array, int* length, int* size, gchar* v
*size = (*size) ? (2 * (*size)) : 4;
#line 372 "/home/jens/Source/shotwell/src/main.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 2331 "main.c"
+#line 2332 "main.c"
}
#line 372 "/home/jens/Source/shotwell/src/main.vala"
(*array)[(*length)++] = value;
#line 372 "/home/jens/Source/shotwell/src/main.vala"
(*array)[*length] = NULL;
-#line 2337 "main.c"
+#line 2338 "main.c"
}
@@ -2349,19 +2350,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 2357 "main.c"
+#line 2358 "main.c"
}
@@ -2381,18 +2382,21 @@ void _vala_main (gchar** args, int args_length1) {
const gchar* _tmp44_ = NULL;
const gchar* _tmp45_ = NULL;
gboolean _tmp46_ = FALSE;
- const gchar* _tmp53_ = NULL;
- gboolean _tmp54_ = FALSE;
+ GDateTime* _tmp53_ = NULL;
+ GDateTime* _tmp54_ = NULL;
const gchar* _tmp55_ = NULL;
- gchar** _tmp57_ = NULL;
- gint _tmp57__length1 = 0;
- GTimer* _tmp58_ = NULL;
- GTimer* _tmp59_ = NULL;
- const gchar* _tmp60_ = NULL;
- gboolean _tmp61_ = FALSE;
+ const gchar* _tmp56_ = NULL;
+ gboolean _tmp57_ = FALSE;
+ const gchar* _tmp58_ = NULL;
+ gchar** _tmp60_ = NULL;
+ gint _tmp60__length1 = 0;
+ GTimer* _tmp61_ = NULL;
+ GTimer* _tmp62_ = NULL;
+ const gchar* _tmp63_ = NULL;
gboolean _tmp64_ = FALSE;
- const gchar* _tmp65_ = NULL;
- gboolean _tmp66_ = FALSE;
+ gboolean _tmp67_ = FALSE;
+ const gchar* _tmp68_ = NULL;
+ gboolean _tmp69_ = FALSE;
GError * _inner_error_ = NULL;
#line 320 "/home/jens/Source/shotwell/src/main.vala"
_tmp0_ = args;
@@ -2414,7 +2418,7 @@ void _vala_main (gchar** args, int args_length1) {
_g_object_unref0 (_tmp3_);
#line 331 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp4_) {
-#line 2410 "main.c"
+#line 2414 "main.c"
GFile* _tmp5_ = NULL;
GFile* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
@@ -2441,7 +2445,7 @@ void _vala_main (gchar** args, int args_length1) {
_g_free0 (_tmp8_);
#line 332 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (_tmp6_);
-#line 2437 "main.c"
+#line 2441 "main.c"
}
{
const gchar* _tmp11_ = NULL;
@@ -2463,7 +2467,7 @@ void _vala_main (gchar** args, int args_length1) {
_tmp14_ = (g_free (_tmp14_), NULL);
#line 338 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2459 "main.c"
+#line 2463 "main.c"
goto __catch209_g_error;
}
}
@@ -2511,7 +2515,7 @@ void _vala_main (gchar** args, int args_length1) {
_g_error_free0 (e);
#line 344 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 2507 "main.c"
+#line 2511 "main.c"
}
__finally209:
#line 337 "/home/jens/Source/shotwell/src/main.vala"
@@ -2522,7 +2526,7 @@ void _vala_main (gchar** args, int args_length1) {
g_clear_error (&_inner_error_);
#line 337 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 2518 "main.c"
+#line 2522 "main.c"
}
#line 347 "/home/jens/Source/shotwell/src/main.vala"
_tmp22_ = commandline_options_show_version;
@@ -2532,17 +2536,17 @@ void _vala_main (gchar** args, int args_length1) {
if (RESOURCES_GIT_VERSION != NULL) {
#line 349 "/home/jens/Source/shotwell/src/main.vala"
g_print ("%s %s (%s)\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
-#line 2528 "main.c"
+#line 2532 "main.c"
} else {
#line 351 "/home/jens/Source/shotwell/src/main.vala"
g_print ("%s %s\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
-#line 2532 "main.c"
+#line 2536 "main.c"
}
#line 353 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_terminate ();
#line 355 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 2538 "main.c"
+#line 2542 "main.c"
}
#line 365 "/home/jens/Source/shotwell/src/main.vala"
_tmp23_ = g_new0 (gchar*, 0 + 1);
@@ -2554,19 +2558,19 @@ void _vala_main (gchar** args, int args_length1) {
_mounts_size_ = mounts_length1;
#line 366 "/home/jens/Source/shotwell/src/main.vala"
filename = NULL;
-#line 2550 "main.c"
+#line 2554 "main.c"
{
gint ctr = 0;
#line 368 "/home/jens/Source/shotwell/src/main.vala"
ctr = 1;
-#line 2555 "main.c"
+#line 2559 "main.c"
{
gboolean _tmp24_ = FALSE;
#line 368 "/home/jens/Source/shotwell/src/main.vala"
_tmp24_ = TRUE;
#line 368 "/home/jens/Source/shotwell/src/main.vala"
while (TRUE) {
-#line 2562 "main.c"
+#line 2566 "main.c"
gint _tmp26_ = 0;
gchar** _tmp27_ = NULL;
gint _tmp27__length1 = 0;
@@ -2580,13 +2584,13 @@ void _vala_main (gchar** args, int args_length1) {
gboolean _tmp33_ = FALSE;
#line 368 "/home/jens/Source/shotwell/src/main.vala"
if (!_tmp24_) {
-#line 2576 "main.c"
+#line 2580 "main.c"
gint _tmp25_ = 0;
#line 368 "/home/jens/Source/shotwell/src/main.vala"
_tmp25_ = ctr;
#line 368 "/home/jens/Source/shotwell/src/main.vala"
ctr = _tmp25_ + 1;
-#line 2582 "main.c"
+#line 2586 "main.c"
}
#line 368 "/home/jens/Source/shotwell/src/main.vala"
_tmp24_ = FALSE;
@@ -2600,7 +2604,7 @@ void _vala_main (gchar** args, int args_length1) {
if (!(_tmp26_ < _tmp27__length1)) {
#line 368 "/home/jens/Source/shotwell/src/main.vala"
break;
-#line 2596 "main.c"
+#line 2600 "main.c"
}
#line 369 "/home/jens/Source/shotwell/src/main.vala"
_tmp28_ = args;
@@ -2620,7 +2624,7 @@ void _vala_main (gchar** args, int args_length1) {
_tmp33_ = library_window_is_mount_uri_supported (_tmp32_);
#line 371 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp33_) {
-#line 2616 "main.c"
+#line 2620 "main.c"
gchar** _tmp34_ = NULL;
gint _tmp34__length1 = 0;
const gchar* _tmp35_ = NULL;
@@ -2635,7 +2639,7 @@ void _vala_main (gchar** args, int args_length1) {
_tmp36_ = g_strdup (_tmp35_);
#line 372 "/home/jens/Source/shotwell/src/main.vala"
_vala_array_add157 (&mounts, &mounts_length1, &_mounts_size_, _tmp36_);
-#line 2631 "main.c"
+#line 2635 "main.c"
} else {
gboolean _tmp37_ = FALSE;
const gchar* _tmp38_ = NULL;
@@ -2646,7 +2650,7 @@ void _vala_main (gchar** args, int args_length1) {
_tmp39_ = is_string_empty (_tmp38_);
#line 373 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp39_) {
-#line 2642 "main.c"
+#line 2646 "main.c"
const gchar* _tmp40_ = NULL;
gboolean _tmp41_ = FALSE;
#line 373 "/home/jens/Source/shotwell/src/main.vala"
@@ -2655,15 +2659,15 @@ void _vala_main (gchar** args, int args_length1) {
_tmp41_ = string_contains (_tmp40_, "://");
#line 373 "/home/jens/Source/shotwell/src/main.vala"
_tmp37_ = !_tmp41_;
-#line 2651 "main.c"
+#line 2655 "main.c"
} else {
#line 373 "/home/jens/Source/shotwell/src/main.vala"
_tmp37_ = FALSE;
-#line 2655 "main.c"
+#line 2659 "main.c"
}
#line 373 "/home/jens/Source/shotwell/src/main.vala"
if (_tmp37_) {
-#line 2659 "main.c"
+#line 2663 "main.c"
const gchar* _tmp42_ = NULL;
gchar* _tmp43_ = NULL;
#line 374 "/home/jens/Source/shotwell/src/main.vala"
@@ -2674,12 +2678,12 @@ void _vala_main (gchar** args, int args_length1) {
_g_free0 (filename);
#line 374 "/home/jens/Source/shotwell/src/main.vala"
filename = _tmp43_;
-#line 2670 "main.c"
+#line 2674 "main.c"
}
}
#line 368 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (arg);
-#line 2675 "main.c"
+#line 2679 "main.c"
}
}
}
@@ -2691,17 +2695,17 @@ void _vala_main (gchar** args, int args_length1) {
if (_tmp46_) {
#line 378 "/home/jens/Source/shotwell/src/main.vala"
_tmp44_ = DEBUG_LIBRARY_PREFIX;
-#line 2687 "main.c"
+#line 2691 "main.c"
} else {
#line 378 "/home/jens/Source/shotwell/src/main.vala"
_tmp44_ = DEBUG_VIEWER_PREFIX;
-#line 2691 "main.c"
+#line 2695 "main.c"
}
#line 378 "/home/jens/Source/shotwell/src/main.vala"
debug_init (_tmp44_);
#line 380 "/home/jens/Source/shotwell/src/main.vala"
if (RESOURCES_GIT_VERSION != NULL) {
-#line 2697 "main.c"
+#line 2701 "main.c"
const gchar* _tmp47_ = NULL;
const gchar* _tmp48_ = NULL;
gboolean _tmp49_ = FALSE;
@@ -2713,15 +2717,15 @@ void _vala_main (gchar** args, int args_length1) {
if (_tmp49_) {
#line 382 "/home/jens/Source/shotwell/src/main.vala"
_tmp47_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2709 "main.c"
+#line 2713 "main.c"
} else {
#line 382 "/home/jens/Source/shotwell/src/main.vala"
_tmp47_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2713 "main.c"
+#line 2717 "main.c"
}
#line 381 "/home/jens/Source/shotwell/src/main.vala"
g_message ("main.vala:381: Shotwell %s %s (%s)", _tmp47_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
-#line 2717 "main.c"
+#line 2721 "main.c"
} else {
const gchar* _tmp50_ = NULL;
const gchar* _tmp51_ = NULL;
@@ -2734,244 +2738,254 @@ void _vala_main (gchar** args, int args_length1) {
if (_tmp52_) {
#line 386 "/home/jens/Source/shotwell/src/main.vala"
_tmp50_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2730 "main.c"
+#line 2734 "main.c"
} else {
#line 386 "/home/jens/Source/shotwell/src/main.vala"
_tmp50_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2734 "main.c"
+#line 2738 "main.c"
}
#line 385 "/home/jens/Source/shotwell/src/main.vala"
g_message ("main.vala:385: Shotwell %s %s", _tmp50_, RESOURCES_APP_VERSION);
-#line 2738 "main.c"
+#line 2742 "main.c"
}
-#line 391 "/home/jens/Source/shotwell/src/main.vala"
- _tmp53_ = filename;
-#line 391 "/home/jens/Source/shotwell/src/main.vala"
- _tmp54_ = is_string_empty (_tmp53_);
-#line 391 "/home/jens/Source/shotwell/src/main.vala"
- application_init (!_tmp54_);
+#line 389 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp53_ = g_date_time_new_now_local ();
+#line 389 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp54_ = _tmp53_;
+#line 389 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp55_ = g_date_time_get_timezone_abbreviation (_tmp54_);
+#line 389 "/home/jens/Source/shotwell/src/main.vala"
+ g_debug ("main.vala:389: Shotwell is running in timezone %s", _tmp55_);
+#line 389 "/home/jens/Source/shotwell/src/main.vala"
+ _g_date_time_unref0 (_tmp54_);
#line 394 "/home/jens/Source/shotwell/src/main.vala"
- _tmp55_ = commandline_options_data_dir;
+ _tmp56_ = filename;
#line 394 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp55_ != NULL) {
-#line 2750 "main.c"
- const gchar* _tmp56_ = NULL;
-#line 395 "/home/jens/Source/shotwell/src/main.vala"
- _tmp56_ = commandline_options_data_dir;
-#line 395 "/home/jens/Source/shotwell/src/main.vala"
- app_dirs_set_data_dir (_tmp56_);
-#line 2756 "main.c"
- } else {
+ _tmp57_ = is_string_empty (_tmp56_);
+#line 394 "/home/jens/Source/shotwell/src/main.vala"
+ application_init (!_tmp57_);
#line 397 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp58_ = commandline_options_data_dir;
+#line 397 "/home/jens/Source/shotwell/src/main.vala"
+ if (_tmp58_ != NULL) {
+#line 2764 "main.c"
+ const gchar* _tmp59_ = NULL;
+#line 398 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp59_ = commandline_options_data_dir;
+#line 398 "/home/jens/Source/shotwell/src/main.vala"
+ app_dirs_set_data_dir (_tmp59_);
+#line 2770 "main.c"
+ } else {
+#line 400 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_try_migrate_data ();
-#line 2760 "main.c"
+#line 2774 "main.c"
}
-#line 400 "/home/jens/Source/shotwell/src/main.vala"
+#line 403 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_verify_data_dir ();
-#line 401 "/home/jens/Source/shotwell/src/main.vala"
- app_dirs_verify_cache_dir ();
-#line 404 "/home/jens/Source/shotwell/src/main.vala"
- _tmp57_ = args;
#line 404 "/home/jens/Source/shotwell/src/main.vala"
- _tmp57__length1 = args_length1;
-#line 404 "/home/jens/Source/shotwell/src/main.vala"
- international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp57_, _tmp57__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE);
-#line 406 "/home/jens/Source/shotwell/src/main.vala"
- _tmp58_ = g_timer_new ();
-#line 406 "/home/jens/Source/shotwell/src/main.vala"
- _g_timer_destroy0 (startup_timer);
-#line 406 "/home/jens/Source/shotwell/src/main.vala"
- startup_timer = _tmp58_;
+ app_dirs_verify_cache_dir ();
#line 407 "/home/jens/Source/shotwell/src/main.vala"
- _tmp59_ = startup_timer;
+ _tmp60_ = args;
#line 407 "/home/jens/Source/shotwell/src/main.vala"
- g_timer_start (_tmp59_);
+ _tmp60__length1 = args_length1;
+#line 407 "/home/jens/Source/shotwell/src/main.vala"
+ international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp60_, _tmp60__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE);
+#line 409 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp61_ = g_timer_new ();
+#line 409 "/home/jens/Source/shotwell/src/main.vala"
+ _g_timer_destroy0 (startup_timer);
+#line 409 "/home/jens/Source/shotwell/src/main.vala"
+ startup_timer = _tmp61_;
#line 410 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp62_ = startup_timer;
+#line 410 "/home/jens/Source/shotwell/src/main.vala"
+ g_timer_start (_tmp62_);
+#line 413 "/home/jens/Source/shotwell/src/main.vala"
g_set_application_name (RESOURCES_APP_TITLE);
-#line 414 "/home/jens/Source/shotwell/src/main.vala"
+#line 417 "/home/jens/Source/shotwell/src/main.vala"
resources_init ();
-#line 419 "/home/jens/Source/shotwell/src/main.vala"
- _tmp60_ = filename;
-#line 419 "/home/jens/Source/shotwell/src/main.vala"
- _tmp61_ = is_string_empty (_tmp60_);
-#line 419 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp61_) {
-#line 2792 "main.c"
- gchar** _tmp62_ = NULL;
- gint _tmp62__length1 = 0;
-#line 420 "/home/jens/Source/shotwell/src/main.vala"
- _tmp62_ = mounts;
-#line 420 "/home/jens/Source/shotwell/src/main.vala"
- _tmp62__length1 = mounts_length1;
-#line 420 "/home/jens/Source/shotwell/src/main.vala"
- library_exec (_tmp62_, _tmp62__length1);
-#line 2801 "main.c"
- } else {
- const gchar* _tmp63_ = NULL;
#line 422 "/home/jens/Source/shotwell/src/main.vala"
- _tmp63_ = filename;
+ _tmp63_ = filename;
#line 422 "/home/jens/Source/shotwell/src/main.vala"
- editing_exec (_tmp63_);
-#line 2808 "main.c"
- }
+ _tmp64_ = is_string_empty (_tmp63_);
+#line 422 "/home/jens/Source/shotwell/src/main.vala"
+ if (_tmp64_) {
+#line 2806 "main.c"
+ gchar** _tmp65_ = NULL;
+ gint _tmp65__length1 = 0;
+#line 423 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp65_ = mounts;
+#line 423 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp65__length1 = mounts_length1;
+#line 423 "/home/jens/Source/shotwell/src/main.vala"
+ library_exec (_tmp65_, _tmp65__length1);
+#line 2815 "main.c"
+ } else {
+ const gchar* _tmp66_ = NULL;
+#line 425 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp66_ = filename;
#line 425 "/home/jens/Source/shotwell/src/main.vala"
+ editing_exec (_tmp66_);
+#line 2822 "main.c"
+ }
+#line 428 "/home/jens/Source/shotwell/src/main.vala"
resources_terminate ();
-#line 426 "/home/jens/Source/shotwell/src/main.vala"
+#line 429 "/home/jens/Source/shotwell/src/main.vala"
application_terminate ();
-#line 427 "/home/jens/Source/shotwell/src/main.vala"
+#line 430 "/home/jens/Source/shotwell/src/main.vala"
debug_terminate ();
-#line 428 "/home/jens/Source/shotwell/src/main.vala"
+#line 431 "/home/jens/Source/shotwell/src/main.vala"
app_dirs_terminate ();
-#line 433 "/home/jens/Source/shotwell/src/main.vala"
- _tmp65_ = filename;
-#line 433 "/home/jens/Source/shotwell/src/main.vala"
- _tmp66_ = is_string_empty (_tmp65_);
-#line 433 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp66_) {
-#line 2824 "main.c"
- gboolean _tmp67_ = FALSE;
-#line 433 "/home/jens/Source/shotwell/src/main.vala"
- _tmp67_ = was_already_running;
-#line 433 "/home/jens/Source/shotwell/src/main.vala"
- _tmp64_ = !_tmp67_;
-#line 2830 "main.c"
+#line 436 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp68_ = filename;
+#line 436 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp69_ = is_string_empty (_tmp68_);
+#line 436 "/home/jens/Source/shotwell/src/main.vala"
+ if (_tmp69_) {
+#line 2838 "main.c"
+ gboolean _tmp70_ = FALSE;
+#line 436 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp70_ = was_already_running;
+#line 436 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp67_ = !_tmp70_;
+#line 2844 "main.c"
} else {
-#line 433 "/home/jens/Source/shotwell/src/main.vala"
- _tmp64_ = FALSE;
-#line 2834 "main.c"
+#line 436 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp67_ = FALSE;
+#line 2848 "main.c"
}
-#line 433 "/home/jens/Source/shotwell/src/main.vala"
- if (_tmp64_) {
-#line 2838 "main.c"
+#line 436 "/home/jens/Source/shotwell/src/main.vala"
+ if (_tmp67_) {
+#line 2852 "main.c"
gchar* orig_path = NULL;
- GFile* _tmp68_ = NULL;
- GFile* _tmp69_ = NULL;
- GFile* _tmp70_ = NULL;
GFile* _tmp71_ = NULL;
- gchar* _tmp72_ = NULL;
- gchar* _tmp73_ = NULL;
- gchar* backup_path = NULL;
- const gchar* _tmp74_ = NULL;
+ GFile* _tmp72_ = NULL;
+ GFile* _tmp73_ = NULL;
+ GFile* _tmp74_ = NULL;
gchar* _tmp75_ = NULL;
-#line 434 "/home/jens/Source/shotwell/src/main.vala"
- _tmp68_ = app_dirs_get_data_subdir ("data", NULL);
-#line 434 "/home/jens/Source/shotwell/src/main.vala"
- _tmp69_ = _tmp68_;
-#line 434 "/home/jens/Source/shotwell/src/main.vala"
- _tmp70_ = g_file_get_child (_tmp69_, "photo.db");
-#line 434 "/home/jens/Source/shotwell/src/main.vala"
- _tmp71_ = _tmp70_;
-#line 434 "/home/jens/Source/shotwell/src/main.vala"
- _tmp72_ = g_file_get_path (_tmp71_);
-#line 434 "/home/jens/Source/shotwell/src/main.vala"
- _tmp73_ = _tmp72_;
-#line 434 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp71_);
-#line 434 "/home/jens/Source/shotwell/src/main.vala"
- _g_object_unref0 (_tmp69_);
-#line 434 "/home/jens/Source/shotwell/src/main.vala"
- orig_path = _tmp73_;
-#line 435 "/home/jens/Source/shotwell/src/main.vala"
- _tmp74_ = orig_path;
-#line 435 "/home/jens/Source/shotwell/src/main.vala"
- _tmp75_ = g_strconcat (_tmp74_, ".bak", NULL);
-#line 435 "/home/jens/Source/shotwell/src/main.vala"
- backup_path = _tmp75_;
-#line 2873 "main.c"
- {
- GFile* src = NULL;
- const gchar* _tmp76_ = NULL;
- GFile* _tmp77_ = NULL;
- GFile* dest = NULL;
- const gchar* _tmp78_ = NULL;
- GFile* _tmp79_ = NULL;
- GFile* _tmp80_ = NULL;
- GFile* _tmp81_ = NULL;
+ gchar* _tmp76_ = NULL;
+ gchar* backup_path = NULL;
+ const gchar* _tmp77_ = NULL;
+ gchar* _tmp78_ = NULL;
+#line 437 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp71_ = app_dirs_get_data_subdir ("data", NULL);
+#line 437 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp72_ = _tmp71_;
+#line 437 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp73_ = g_file_get_child (_tmp72_, "photo.db");
+#line 437 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp74_ = _tmp73_;
+#line 437 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp75_ = g_file_get_path (_tmp74_);
#line 437 "/home/jens/Source/shotwell/src/main.vala"
- _tmp76_ = orig_path;
+ _tmp76_ = _tmp75_;
#line 437 "/home/jens/Source/shotwell/src/main.vala"
- _tmp77_ = g_file_new_for_commandline_arg (_tmp76_);
+ _g_object_unref0 (_tmp74_);
#line 437 "/home/jens/Source/shotwell/src/main.vala"
- src = _tmp77_;
+ _g_object_unref0 (_tmp72_);
+#line 437 "/home/jens/Source/shotwell/src/main.vala"
+ orig_path = _tmp76_;
#line 438 "/home/jens/Source/shotwell/src/main.vala"
- _tmp78_ = backup_path;
+ _tmp77_ = orig_path;
#line 438 "/home/jens/Source/shotwell/src/main.vala"
- _tmp79_ = g_file_new_for_commandline_arg (_tmp78_);
+ _tmp78_ = g_strconcat (_tmp77_, ".bak", NULL);
#line 438 "/home/jens/Source/shotwell/src/main.vala"
- dest = _tmp79_;
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
- _tmp80_ = src;
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
- _tmp81_ = dest;
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
- g_file_copy (_tmp80_, _tmp81_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+ backup_path = _tmp78_;
+#line 2887 "main.c"
+ {
+ GFile* src = NULL;
+ const gchar* _tmp79_ = NULL;
+ GFile* _tmp80_ = NULL;
+ GFile* dest = NULL;
+ const gchar* _tmp81_ = NULL;
+ GFile* _tmp82_ = NULL;
+ GFile* _tmp83_ = NULL;
+ GFile* _tmp84_ = NULL;
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp79_ = orig_path;
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp80_ = g_file_new_for_commandline_arg (_tmp79_);
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
+ src = _tmp80_;
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp81_ = backup_path;
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp82_ = g_file_new_for_commandline_arg (_tmp81_);
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
+ dest = _tmp82_;
+#line 442 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp83_ = src;
+#line 442 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp84_ = dest;
+#line 442 "/home/jens/Source/shotwell/src/main.vala"
+ g_file_copy (_tmp83_, _tmp84_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_);
+#line 442 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 442 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (dest);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 442 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (src);
-#line 2907 "main.c"
+#line 2921 "main.c"
goto __catch210_g_error;
}
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 439 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (dest);
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 439 "/home/jens/Source/shotwell/src/main.vala"
_g_object_unref0 (src);
-#line 2914 "main.c"
+#line 2928 "main.c"
}
goto __finally210;
__catch210_g_error:
{
GError* _error_ = NULL;
- GError* _tmp82_ = NULL;
- const gchar* _tmp83_ = NULL;
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+ GError* _tmp85_ = NULL;
+ const gchar* _tmp86_ = NULL;
+#line 439 "/home/jens/Source/shotwell/src/main.vala"
_error_ = _inner_error_;
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 439 "/home/jens/Source/shotwell/src/main.vala"
_inner_error_ = NULL;
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
- _tmp82_ = _error_;
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
- _tmp83_ = _tmp82_->message;
-#line 443 "/home/jens/Source/shotwell/src/main.vala"
- g_warning ("main.vala:443: Failed to create backup file of database: %s", _tmp83_);
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp85_ = _error_;
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
+ _tmp86_ = _tmp85_->message;
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
+ g_warning ("main.vala:446: Failed to create backup file of database: %s", _tmp86_);
+#line 439 "/home/jens/Source/shotwell/src/main.vala"
_g_error_free0 (_error_);
-#line 2934 "main.c"
+#line 2948 "main.c"
}
__finally210:
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 439 "/home/jens/Source/shotwell/src/main.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 439 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (backup_path);
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 439 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (orig_path);
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 439 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (filename);
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 439 "/home/jens/Source/shotwell/src/main.vala"
mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL);
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 439 "/home/jens/Source/shotwell/src/main.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 439 "/home/jens/Source/shotwell/src/main.vala"
g_clear_error (&_inner_error_);
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 439 "/home/jens/Source/shotwell/src/main.vala"
return;
-#line 2953 "main.c"
+#line 2967 "main.c"
}
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
+#line 449 "/home/jens/Source/shotwell/src/main.vala"
sync ();
-#line 433 "/home/jens/Source/shotwell/src/main.vala"
+#line 436 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (backup_path);
-#line 433 "/home/jens/Source/shotwell/src/main.vala"
+#line 436 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (orig_path);
-#line 2961 "main.c"
+#line 2975 "main.c"
}
#line 317 "/home/jens/Source/shotwell/src/main.vala"
_g_free0 (filename);
#line 317 "/home/jens/Source/shotwell/src/main.vala"
mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL);
-#line 2967 "main.c"
+#line 2981 "main.c"
}
@@ -2986,7 +3000,7 @@ int main (int argc, char ** argv) {
_vala_main (argv, argc);
#line 317 "/home/jens/Source/shotwell/src/main.vala"
return 0;
-#line 2982 "main.c"
+#line 2996 "main.c"
}
diff --git a/src/main.vala b/src/main.vala
index 2df29ed..bbd3317 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -385,6 +385,9 @@ void main(string[] args) {
message("Shotwell %s %s",
is_string_empty(filename) ? Resources.APP_LIBRARY_ROLE : Resources.APP_DIRECT_ROLE,
Resources.APP_VERSION);
+
+ debug ("Shotwell is running in timezone %s", new
+ DateTime.now_local().get_timezone_abbreviation ());
// Have a filename here? If so, configure ourselves for direct
// mode, otherwise, default to library mode.
diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c
index 11ad8c6..538669d 100644
--- a/src/photos/BmpSupport.c
+++ b/src/photos/BmpSupport.c
@@ -1,4 +1,4 @@
-/* BmpSupport.c generated by valac 0.32.1, the Vala compiler
+/* BmpSupport.c generated by valac 0.34.1, the Vala compiler
* generated from BmpSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1024,7 +1024,7 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
#line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp4__length1 = file_lead_sequence_length1;
#line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_INPUT_STREAM, GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
+ g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
#line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c
index 56cfe34..1ee0beb 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -1,4 +1,4 @@
-/* GRaw.c generated by valac 0.32.1, the Vala compiler
+/* GRaw.c generated by valac 0.34.1, the Vala compiler
* generated from GRaw.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -498,7 +498,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp10_ = _tmp9_;
#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- _tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+ _tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp12_ = _tmp11_;
#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c
index f016592..6c66a3d 100644
--- a/src/photos/GdkSupport.c
+++ b/src/photos/GdkSupport.c
@@ -1,4 +1,4 @@
-/* GdkSupport.c generated by valac 0.32.1, the Vala compiler
+/* GdkSupport.c generated by valac 0.34.1, the Vala compiler
* generated from GdkSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -930,7 +930,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
_tmp47__length1 = buffer_length1;
#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
- _tmp48_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, G_TYPE_INPUT_STREAM, GInputStream), _tmp47_, (gsize) _tmp47__length1, NULL, &_inner_error_);
+ _tmp48_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), _tmp47_, (gsize) _tmp47__length1, NULL, &_inner_error_);
#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
bytes_read = (gsize) _tmp48_;
#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1127,7 +1127,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
_tmp69_ = fins;
#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
- g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+ g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
diff --git a/src/photos/JfifSupport.c b/src/photos/JfifSupport.c
index 3c86a7a..cd5d127 100644
--- a/src/photos/JfifSupport.c
+++ b/src/photos/JfifSupport.c
@@ -1,4 +1,4 @@
-/* JfifSupport.c generated by valac 0.32.1, the Vala compiler
+/* JfifSupport.c generated by valac 0.34.1, the Vala compiler
* generated from JfifSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1870,7 +1870,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
#line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
_tmp0_ = fins;
#line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp1_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
+ _tmp1_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
#line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
dins = _tmp1_;
#line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c
index 2f05603..859ca74 100644
--- a/src/photos/PhotoFileAdapter.c
+++ b/src/photos/PhotoFileAdapter.c
@@ -1,4 +1,4 @@
-/* PhotoFileAdapter.c generated by valac 0.32.1, the Vala compiler
+/* PhotoFileAdapter.c generated by valac 0.34.1, the Vala compiler
* generated from PhotoFileAdapter.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c
index 6e05342..f623c3f 100644
--- a/src/photos/PhotoFileFormat.c
+++ b/src/photos/PhotoFileFormat.c
@@ -1,4 +1,4 @@
-/* PhotoFileFormat.c generated by valac 0.32.1, the Vala compiler
+/* PhotoFileFormat.c generated by valac 0.34.1, the Vala compiler
* generated from PhotoFileFormat.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PhotoFileSniffer.c b/src/photos/PhotoFileSniffer.c
index 8d44d6b..7351b3b 100644
--- a/src/photos/PhotoFileSniffer.c
+++ b/src/photos/PhotoFileSniffer.c
@@ -1,4 +1,4 @@
-/* PhotoFileSniffer.c generated by valac 0.32.1, the Vala compiler
+/* PhotoFileSniffer.c generated by valac 0.34.1, the Vala compiler
* generated from PhotoFileSniffer.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c
index 1418eb3..e2a44b3 100644
--- a/src/photos/PhotoMetadata.c
+++ b/src/photos/PhotoMetadata.c
@@ -1,4 +1,4 @@
-/* PhotoMetadata.c generated by valac 0.32.1, the Vala compiler
+/* PhotoMetadata.c generated by valac 0.34.1, the Vala compiler
* generated from PhotoMetadata.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -103,7 +103,6 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass;
typedef struct _PhotoMetadataPrivate PhotoMetadataPrivate;
#define PHOTO_METADATA_TYPE_SET_OPTION (photo_metadata_set_option_get_type ())
-#define _gexiv2_metadata_free0(var) ((var == NULL) ? NULL : (var = (gexiv2_metadata_free (var), NULL)))
#define _exif_data_unref0(var) ((var == NULL) ? NULL : (var = (exif_data_unref (var), NULL)))
#define TYPE_PREPARE_INPUT_TEXT_OPTIONS (prepare_input_text_options_get_type ())
@@ -146,7 +145,6 @@ typedef struct _HierarchicalTagIndexClass HierarchicalTagIndexClass;
#define TYPE_RATING (rating_get_type ())
typedef struct _PhotoMetadataInternalPhotoPreviewPrivate PhotoMetadataInternalPhotoPreviewPrivate;
-#define _gexiv2_preview_image_free0(var) ((var == NULL) ? NULL : (var = (gexiv2_preview_image_free (var), NULL)))
#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -672,21 +670,21 @@ HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_typ
self->is_writeable = _tmp5_;
#line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self;
-#line 676 "PhotoMetadata.c"
+#line 674 "PhotoMetadata.c"
}
HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable) {
#line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return hierarchical_keyword_field_construct (TYPE_HIERARCHICAL_KEYWORD_FIELD, field_name, path_separator, wants_leading_separator, is_writeable);
-#line 683 "PhotoMetadata.c"
+#line 681 "PhotoMetadata.c"
}
static void value_hierarchical_keyword_field_init (GValue* value) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 690 "PhotoMetadata.c"
+#line 688 "PhotoMetadata.c"
}
@@ -695,7 +693,7 @@ static void value_hierarchical_keyword_field_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
hierarchical_keyword_field_unref (value->data[0].v_pointer);
-#line 699 "PhotoMetadata.c"
+#line 697 "PhotoMetadata.c"
}
}
@@ -705,11 +703,11 @@ static void value_hierarchical_keyword_field_copy_value (const GValue* src_value
if (src_value->data[0].v_pointer) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
dest_value->data[0].v_pointer = hierarchical_keyword_field_ref (src_value->data[0].v_pointer);
-#line 709 "PhotoMetadata.c"
+#line 707 "PhotoMetadata.c"
} else {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
dest_value->data[0].v_pointer = NULL;
-#line 713 "PhotoMetadata.c"
+#line 711 "PhotoMetadata.c"
}
}
@@ -717,37 +715,37 @@ static void value_hierarchical_keyword_field_copy_value (const GValue* src_value
static gpointer value_hierarchical_keyword_field_peek_pointer (const GValue* value) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return value->data[0].v_pointer;
-#line 721 "PhotoMetadata.c"
+#line 719 "PhotoMetadata.c"
}
static gchar* value_hierarchical_keyword_field_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (collect_values[0].v_pointer) {
-#line 728 "PhotoMetadata.c"
+#line 726 "PhotoMetadata.c"
HierarchicalKeywordField* object;
object = collect_values[0].v_pointer;
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (object->parent_instance.g_class == NULL) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 735 "PhotoMetadata.c"
+#line 733 "PhotoMetadata.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 739 "PhotoMetadata.c"
+#line 737 "PhotoMetadata.c"
}
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = hierarchical_keyword_field_ref (object);
-#line 743 "PhotoMetadata.c"
+#line 741 "PhotoMetadata.c"
} else {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 747 "PhotoMetadata.c"
+#line 745 "PhotoMetadata.c"
}
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 751 "PhotoMetadata.c"
+#line 749 "PhotoMetadata.c"
}
@@ -758,25 +756,25 @@ static gchar* value_hierarchical_keyword_field_lcopy_value (const GValue* value,
if (!object_p) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 762 "PhotoMetadata.c"
+#line 760 "PhotoMetadata.c"
}
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!value->data[0].v_pointer) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = NULL;
-#line 768 "PhotoMetadata.c"
+#line 766 "PhotoMetadata.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = value->data[0].v_pointer;
-#line 772 "PhotoMetadata.c"
+#line 770 "PhotoMetadata.c"
} else {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = hierarchical_keyword_field_ref (value->data[0].v_pointer);
-#line 776 "PhotoMetadata.c"
+#line 774 "PhotoMetadata.c"
}
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 780 "PhotoMetadata.c"
+#line 778 "PhotoMetadata.c"
}
@@ -790,7 +788,7 @@ GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gcha
G_PARAM_SPEC (spec)->value_type = object_type;
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return G_PARAM_SPEC (spec);
-#line 794 "PhotoMetadata.c"
+#line 792 "PhotoMetadata.c"
}
@@ -799,7 +797,7 @@ gpointer value_get_hierarchical_keyword_field (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD), NULL);
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return value->data[0].v_pointer;
-#line 803 "PhotoMetadata.c"
+#line 801 "PhotoMetadata.c"
}
@@ -819,17 +817,17 @@ void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
hierarchical_keyword_field_ref (value->data[0].v_pointer);
-#line 823 "PhotoMetadata.c"
+#line 821 "PhotoMetadata.c"
} else {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 827 "PhotoMetadata.c"
+#line 825 "PhotoMetadata.c"
}
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (old) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
hierarchical_keyword_field_unref (old);
-#line 833 "PhotoMetadata.c"
+#line 831 "PhotoMetadata.c"
}
}
@@ -848,17 +846,17 @@ void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = v_object;
-#line 852 "PhotoMetadata.c"
+#line 850 "PhotoMetadata.c"
} else {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 856 "PhotoMetadata.c"
+#line 854 "PhotoMetadata.c"
}
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (old) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
hierarchical_keyword_field_unref (old);
-#line 862 "PhotoMetadata.c"
+#line 860 "PhotoMetadata.c"
}
}
@@ -868,14 +866,14 @@ static void hierarchical_keyword_field_class_init (HierarchicalKeywordFieldClass
hierarchical_keyword_field_parent_class = g_type_class_peek_parent (klass);
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
((HierarchicalKeywordFieldClass *) klass)->finalize = hierarchical_keyword_field_finalize;
-#line 872 "PhotoMetadata.c"
+#line 870 "PhotoMetadata.c"
}
static void hierarchical_keyword_field_instance_init (HierarchicalKeywordField * self) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->ref_count = 1;
-#line 879 "PhotoMetadata.c"
+#line 877 "PhotoMetadata.c"
}
@@ -889,7 +887,7 @@ static void hierarchical_keyword_field_finalize (HierarchicalKeywordField* obj)
_g_free0 (self->field_name);
#line 33 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (self->path_separator);
-#line 893 "PhotoMetadata.c"
+#line 891 "PhotoMetadata.c"
}
@@ -914,7 +912,7 @@ gpointer hierarchical_keyword_field_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return instance;
-#line 918 "PhotoMetadata.c"
+#line 916 "PhotoMetadata.c"
}
@@ -927,7 +925,7 @@ void hierarchical_keyword_field_unref (gpointer instance) {
HIERARCHICAL_KEYWORD_FIELD_GET_CLASS (self)->finalize (self);
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 931 "PhotoMetadata.c"
+#line 929 "PhotoMetadata.c"
}
}
@@ -986,7 +984,7 @@ PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dim
self->priv->extension = _tmp7_;
#line 53 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self;
-#line 990 "PhotoMetadata.c"
+#line 988 "PhotoMetadata.c"
}
@@ -1004,7 +1002,7 @@ gchar* photo_preview_get_name (PhotoPreview* self) {
result = _tmp1_;
#line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1008 "PhotoMetadata.c"
+#line 1006 "PhotoMetadata.c"
}
@@ -1018,7 +1016,7 @@ void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result)
*result = _tmp0_;
#line 66 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 1022 "PhotoMetadata.c"
+#line 1020 "PhotoMetadata.c"
}
@@ -1033,7 +1031,7 @@ guint32 photo_preview_get_size (PhotoPreview* self) {
result = _tmp0_;
#line 70 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1037 "PhotoMetadata.c"
+#line 1035 "PhotoMetadata.c"
}
@@ -1051,7 +1049,7 @@ gchar* photo_preview_get_mime_type (PhotoPreview* self) {
result = _tmp1_;
#line 74 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1055 "PhotoMetadata.c"
+#line 1053 "PhotoMetadata.c"
}
@@ -1069,7 +1067,7 @@ gchar* photo_preview_get_extension (PhotoPreview* self) {
result = _tmp1_;
#line 78 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1073 "PhotoMetadata.c"
+#line 1071 "PhotoMetadata.c"
}
@@ -1078,7 +1076,7 @@ static guint8* photo_preview_real_flatten (PhotoPreview* self, int* result_lengt
g_critical ("Type `%s' does not implement abstract method `photo_preview_flatten'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 81 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 1082 "PhotoMetadata.c"
+#line 1080 "PhotoMetadata.c"
}
@@ -1087,14 +1085,14 @@ guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError**
g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
#line 81 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return PHOTO_PREVIEW_GET_CLASS (self)->flatten (self, result_length1, error);
-#line 1091 "PhotoMetadata.c"
+#line 1089 "PhotoMetadata.c"
}
static guint8* _vala_array_dup4 (guint8* self, int length) {
#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_memdup (self, length * sizeof (guint8));
-#line 1098 "PhotoMetadata.c"
+#line 1096 "PhotoMetadata.c"
}
@@ -1120,7 +1118,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
g_propagate_error (error, _inner_error_);
#line 84 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 1124 "PhotoMetadata.c"
+#line 1122 "PhotoMetadata.c"
}
{
GdkPixbuf* _tmp2_ = NULL;
@@ -1140,7 +1138,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _tmp4_;
#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp6_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+ _tmp6_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = _tmp6_;
#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1149,7 +1147,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
_tmp2_ = _tmp7_;
#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1153 "PhotoMetadata.c"
+#line 1151 "PhotoMetadata.c"
goto __catch23_g_error;
}
#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1164,7 +1162,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
flattened = (g_free (flattened), NULL);
#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1168 "PhotoMetadata.c"
+#line 1166 "PhotoMetadata.c"
}
goto __finally23;
__catch23_g_error:
@@ -1193,7 +1191,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
flattened = (g_free (flattened), NULL);
#line 94 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1197 "PhotoMetadata.c"
+#line 1195 "PhotoMetadata.c"
}
__finally23:
#line 88 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1202,7 +1200,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
flattened = (g_free (flattened), NULL);
#line 88 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 1206 "PhotoMetadata.c"
+#line 1204 "PhotoMetadata.c"
}
@@ -1211,14 +1209,14 @@ GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error) {
g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
#line 83 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return PHOTO_PREVIEW_GET_CLASS (self)->get_pixbuf (self, error);
-#line 1215 "PhotoMetadata.c"
+#line 1213 "PhotoMetadata.c"
}
static void value_photo_preview_init (GValue* value) {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 1222 "PhotoMetadata.c"
+#line 1220 "PhotoMetadata.c"
}
@@ -1227,7 +1225,7 @@ static void value_photo_preview_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_preview_unref (value->data[0].v_pointer);
-#line 1231 "PhotoMetadata.c"
+#line 1229 "PhotoMetadata.c"
}
}
@@ -1237,11 +1235,11 @@ static void value_photo_preview_copy_value (const GValue* src_value, GValue* des
if (src_value->data[0].v_pointer) {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
dest_value->data[0].v_pointer = photo_preview_ref (src_value->data[0].v_pointer);
-#line 1241 "PhotoMetadata.c"
+#line 1239 "PhotoMetadata.c"
} else {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1245 "PhotoMetadata.c"
+#line 1243 "PhotoMetadata.c"
}
}
@@ -1249,37 +1247,37 @@ static void value_photo_preview_copy_value (const GValue* src_value, GValue* des
static gpointer value_photo_preview_peek_pointer (const GValue* value) {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return value->data[0].v_pointer;
-#line 1253 "PhotoMetadata.c"
+#line 1251 "PhotoMetadata.c"
}
static gchar* value_photo_preview_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (collect_values[0].v_pointer) {
-#line 1260 "PhotoMetadata.c"
+#line 1258 "PhotoMetadata.c"
PhotoPreview* object;
object = collect_values[0].v_pointer;
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (object->parent_instance.g_class == NULL) {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1267 "PhotoMetadata.c"
+#line 1265 "PhotoMetadata.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1271 "PhotoMetadata.c"
+#line 1269 "PhotoMetadata.c"
}
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = photo_preview_ref (object);
-#line 1275 "PhotoMetadata.c"
+#line 1273 "PhotoMetadata.c"
} else {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 1279 "PhotoMetadata.c"
+#line 1277 "PhotoMetadata.c"
}
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 1283 "PhotoMetadata.c"
+#line 1281 "PhotoMetadata.c"
}
@@ -1290,25 +1288,25 @@ static gchar* value_photo_preview_lcopy_value (const GValue* value, guint n_coll
if (!object_p) {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1294 "PhotoMetadata.c"
+#line 1292 "PhotoMetadata.c"
}
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!value->data[0].v_pointer) {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = NULL;
-#line 1300 "PhotoMetadata.c"
+#line 1298 "PhotoMetadata.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = value->data[0].v_pointer;
-#line 1304 "PhotoMetadata.c"
+#line 1302 "PhotoMetadata.c"
} else {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*object_p = photo_preview_ref (value->data[0].v_pointer);
-#line 1308 "PhotoMetadata.c"
+#line 1306 "PhotoMetadata.c"
}
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 1312 "PhotoMetadata.c"
+#line 1310 "PhotoMetadata.c"
}
@@ -1322,7 +1320,7 @@ GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, cons
G_PARAM_SPEC (spec)->value_type = object_type;
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return G_PARAM_SPEC (spec);
-#line 1326 "PhotoMetadata.c"
+#line 1324 "PhotoMetadata.c"
}
@@ -1331,7 +1329,7 @@ gpointer value_get_photo_preview (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW), NULL);
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return value->data[0].v_pointer;
-#line 1335 "PhotoMetadata.c"
+#line 1333 "PhotoMetadata.c"
}
@@ -1351,17 +1349,17 @@ void value_set_photo_preview (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_preview_ref (value->data[0].v_pointer);
-#line 1355 "PhotoMetadata.c"
+#line 1353 "PhotoMetadata.c"
} else {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 1359 "PhotoMetadata.c"
+#line 1357 "PhotoMetadata.c"
}
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (old) {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_preview_unref (old);
-#line 1365 "PhotoMetadata.c"
+#line 1363 "PhotoMetadata.c"
}
}
@@ -1380,17 +1378,17 @@ void value_take_photo_preview (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = v_object;
-#line 1384 "PhotoMetadata.c"
+#line 1382 "PhotoMetadata.c"
} else {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value->data[0].v_pointer = NULL;
-#line 1388 "PhotoMetadata.c"
+#line 1386 "PhotoMetadata.c"
}
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (old) {
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_preview_unref (old);
-#line 1394 "PhotoMetadata.c"
+#line 1392 "PhotoMetadata.c"
}
}
@@ -1406,7 +1404,7 @@ static void photo_preview_class_init (PhotoPreviewClass * klass) {
((PhotoPreviewClass *) klass)->flatten = photo_preview_real_flatten;
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
((PhotoPreviewClass *) klass)->get_pixbuf = photo_preview_real_get_pixbuf;
-#line 1410 "PhotoMetadata.c"
+#line 1408 "PhotoMetadata.c"
}
@@ -1415,7 +1413,7 @@ static void photo_preview_instance_init (PhotoPreview * self) {
self->priv = PHOTO_PREVIEW_GET_PRIVATE (self);
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->ref_count = 1;
-#line 1419 "PhotoMetadata.c"
+#line 1417 "PhotoMetadata.c"
}
@@ -1431,7 +1429,7 @@ static void photo_preview_finalize (PhotoPreview* obj) {
_g_free0 (self->priv->mime_type);
#line 51 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (self->priv->extension);
-#line 1435 "PhotoMetadata.c"
+#line 1433 "PhotoMetadata.c"
}
@@ -1456,7 +1454,7 @@ gpointer photo_preview_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return instance;
-#line 1460 "PhotoMetadata.c"
+#line 1458 "PhotoMetadata.c"
}
@@ -1469,7 +1467,7 @@ void photo_preview_unref (gpointer instance) {
PHOTO_PREVIEW_GET_CLASS (self)->finalize (self);
#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1473 "PhotoMetadata.c"
+#line 1471 "PhotoMetadata.c"
}
}
@@ -1492,14 +1490,14 @@ PhotoMetadata* photo_metadata_construct (GType object_type) {
self = (PhotoMetadata*) media_metadata_construct (object_type);
#line 139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self;
-#line 1496 "PhotoMetadata.c"
+#line 1494 "PhotoMetadata.c"
}
PhotoMetadata* photo_metadata_new (void) {
#line 139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return photo_metadata_construct (TYPE_PHOTO_METADATA);
-#line 1503 "PhotoMetadata.c"
+#line 1501 "PhotoMetadata.c"
}
@@ -1524,7 +1522,7 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file
#line 143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = gexiv2_metadata_new ();
#line 143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _gexiv2_metadata_free0 (self->priv->exiv2);
+ _g_object_unref0 (self->priv->exiv2);
#line 143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->exiv2 = _tmp0_;
#line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1549,7 +1547,7 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file
g_propagate_error (error, _inner_error_);
#line 146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 1553 "PhotoMetadata.c"
+#line 1551 "PhotoMetadata.c"
}
#line 147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = file;
@@ -1573,7 +1571,7 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file
_g_free0 (self->priv->source_name);
#line 148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->source_name = _tmp10_;
-#line 1577 "PhotoMetadata.c"
+#line 1575 "PhotoMetadata.c"
}
@@ -1605,7 +1603,7 @@ void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** er
g_propagate_error (error, _inner_error_);
#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 1609 "PhotoMetadata.c"
+#line 1607 "PhotoMetadata.c"
}
}
@@ -1633,7 +1631,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
_tmp0_ = length;
#line 156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ <= 0) {
-#line 1637 "PhotoMetadata.c"
+#line 1635 "PhotoMetadata.c"
guint8* _tmp1_ = NULL;
gint _tmp1__length1 = 0;
#line 157 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1642,7 +1640,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
_tmp1__length1 = buffer_length1;
#line 157 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
length = _tmp1__length1;
-#line 1646 "PhotoMetadata.c"
+#line 1644 "PhotoMetadata.c"
}
#line 159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = buffer;
@@ -1655,7 +1653,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
#line 161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = gexiv2_metadata_new ();
#line 161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _gexiv2_metadata_free0 (self->priv->exiv2);
+ _g_object_unref0 (self->priv->exiv2);
#line 161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->exiv2 = _tmp4_;
#line 162 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1678,7 +1676,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
g_propagate_error (error, _inner_error_);
#line 164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 1682 "PhotoMetadata.c"
+#line 1680 "PhotoMetadata.c"
}
#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = buffer;
@@ -1700,7 +1698,7 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
_g_free0 (self->priv->source_name);
#line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->source_name = _tmp12_;
-#line 1704 "PhotoMetadata.c"
+#line 1702 "PhotoMetadata.c"
}
@@ -1727,7 +1725,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
_tmp0_ = length;
#line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ <= 0) {
-#line 1731 "PhotoMetadata.c"
+#line 1729 "PhotoMetadata.c"
guint8* _tmp1_ = NULL;
gint _tmp1__length1 = 0;
#line 171 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1736,7 +1734,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
_tmp1__length1 = buffer_length1;
#line 171 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
length = _tmp1__length1;
-#line 1740 "PhotoMetadata.c"
+#line 1738 "PhotoMetadata.c"
}
#line 173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = buffer;
@@ -1749,7 +1747,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
#line 175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = gexiv2_metadata_new ();
#line 175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _gexiv2_metadata_free0 (self->priv->exiv2);
+ _g_object_unref0 (self->priv->exiv2);
#line 175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->exiv2 = _tmp4_;
#line 176 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1772,7 +1770,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
g_propagate_error (error, _inner_error_);
#line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 1776 "PhotoMetadata.c"
+#line 1774 "PhotoMetadata.c"
}
#line 179 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = buffer;
@@ -1794,7 +1792,7 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
_g_free0 (self->priv->source_name);
#line 180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->source_name = _tmp12_;
-#line 1798 "PhotoMetadata.c"
+#line 1796 "PhotoMetadata.c"
}
@@ -1818,7 +1816,7 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) {
result = METADATA_DOMAIN_EXIF;
#line 185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1822 "PhotoMetadata.c"
+#line 1820 "PhotoMetadata.c"
}
#line 187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = tag;
@@ -1830,7 +1828,7 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) {
result = METADATA_DOMAIN_XMP;
#line 188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1834 "PhotoMetadata.c"
+#line 1832 "PhotoMetadata.c"
}
#line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = tag;
@@ -1842,13 +1840,13 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) {
result = METADATA_DOMAIN_IPTC;
#line 191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1846 "PhotoMetadata.c"
+#line 1844 "PhotoMetadata.c"
}
#line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = METADATA_DOMAIN_UNKNOWN;
#line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1852 "PhotoMetadata.c"
+#line 1850 "PhotoMetadata.c"
}
@@ -1863,7 +1861,7 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
switch (_tmp0_) {
#line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 1867 "PhotoMetadata.c"
+#line 1865 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
@@ -1875,11 +1873,11 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
result = _tmp2_;
#line 199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1879 "PhotoMetadata.c"
+#line 1877 "PhotoMetadata.c"
}
#line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 1883 "PhotoMetadata.c"
+#line 1881 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
@@ -1891,11 +1889,11 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
result = _tmp4_;
#line 202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1895 "PhotoMetadata.c"
+#line 1893 "PhotoMetadata.c"
}
#line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 1899 "PhotoMetadata.c"
+#line 1897 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
@@ -1907,18 +1905,18 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
result = _tmp6_;
#line 205 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1911 "PhotoMetadata.c"
+#line 1909 "PhotoMetadata.c"
}
default:
#line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_UNKNOWN:
-#line 1916 "PhotoMetadata.c"
+#line 1914 "PhotoMetadata.c"
{
#line 209 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = FALSE;
#line 209 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1922 "PhotoMetadata.c"
+#line 1920 "PhotoMetadata.c"
}
}
}
@@ -1935,7 +1933,7 @@ gboolean photo_metadata_has_exif (PhotoMetadata* self) {
result = _tmp0_;
#line 214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1939 "PhotoMetadata.c"
+#line 1937 "PhotoMetadata.c"
}
@@ -1950,7 +1948,7 @@ gboolean photo_metadata_has_xmp (PhotoMetadata* self) {
result = _tmp0_;
#line 218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1954 "PhotoMetadata.c"
+#line 1952 "PhotoMetadata.c"
}
@@ -1965,7 +1963,7 @@ gboolean photo_metadata_has_iptc (PhotoMetadata* self) {
result = _tmp0_;
#line 222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1969 "PhotoMetadata.c"
+#line 1967 "PhotoMetadata.c"
}
@@ -1980,7 +1978,7 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
switch (_tmp0_) {
#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 1984 "PhotoMetadata.c"
+#line 1982 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
@@ -1992,11 +1990,11 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
result = _tmp2_;
#line 228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 1996 "PhotoMetadata.c"
+#line 1994 "PhotoMetadata.c"
}
#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 2000 "PhotoMetadata.c"
+#line 1998 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
@@ -2008,11 +2006,11 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
result = _tmp4_;
#line 231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2012 "PhotoMetadata.c"
+#line 2010 "PhotoMetadata.c"
}
#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 2016 "PhotoMetadata.c"
+#line 2014 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
@@ -2024,18 +2022,18 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
result = _tmp6_;
#line 234 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2028 "PhotoMetadata.c"
+#line 2026 "PhotoMetadata.c"
}
default:
#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_UNKNOWN:
-#line 2033 "PhotoMetadata.c"
+#line 2031 "PhotoMetadata.c"
{
#line 238 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = FALSE;
#line 238 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2039 "PhotoMetadata.c"
+#line 2037 "PhotoMetadata.c"
}
}
}
@@ -2052,7 +2050,7 @@ gboolean photo_metadata_can_write_exif (PhotoMetadata* self) {
result = _tmp0_;
#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2056 "PhotoMetadata.c"
+#line 2054 "PhotoMetadata.c"
}
@@ -2067,7 +2065,7 @@ gboolean photo_metadata_can_write_xmp (PhotoMetadata* self) {
result = _tmp0_;
#line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2071 "PhotoMetadata.c"
+#line 2069 "PhotoMetadata.c"
}
@@ -2082,7 +2080,7 @@ gboolean photo_metadata_can_write_iptc (PhotoMetadata* self) {
result = _tmp0_;
#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2086 "PhotoMetadata.c"
+#line 2084 "PhotoMetadata.c"
}
@@ -2105,7 +2103,7 @@ gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) {
result = _tmp2_;
#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2109 "PhotoMetadata.c"
+#line 2107 "PhotoMetadata.c"
}
@@ -2121,7 +2119,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
_tmp0__target = compare_func_target;
#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ == NULL) {
-#line 2125 "PhotoMetadata.c"
+#line 2123 "PhotoMetadata.c"
GeeHashSet* _tmp1_ = NULL;
#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -2137,7 +2135,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
compare_func_target_destroy_notify = NULL;
#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2141 "PhotoMetadata.c"
+#line 2139 "PhotoMetadata.c"
} else {
GCompareDataFunc _tmp2_ = NULL;
void* _tmp2__target = NULL;
@@ -2165,7 +2163,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
compare_func_target_destroy_notify = NULL;
#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2169 "PhotoMetadata.c"
+#line 2167 "PhotoMetadata.c"
}
#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
@@ -2175,7 +2173,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
compare_func_target = NULL;
#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
compare_func_target_destroy_notify = NULL;
-#line 2179 "PhotoMetadata.c"
+#line 2177 "PhotoMetadata.c"
}
@@ -2209,7 +2207,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
switch (_tmp0_) {
#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 2213 "PhotoMetadata.c"
+#line 2211 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp1_ = NULL;
gchar** _tmp2_ = NULL;
@@ -2228,11 +2226,11 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tags_size_ = tags_length1;
#line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 2232 "PhotoMetadata.c"
+#line 2230 "PhotoMetadata.c"
}
#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 2236 "PhotoMetadata.c"
+#line 2234 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp4_ = NULL;
gchar** _tmp5_ = NULL;
@@ -2251,11 +2249,11 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tags_size_ = tags_length1;
#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 2255 "PhotoMetadata.c"
+#line 2253 "PhotoMetadata.c"
}
#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 2259 "PhotoMetadata.c"
+#line 2257 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp7_ = NULL;
gchar** _tmp8_ = NULL;
@@ -2274,12 +2272,12 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tags_size_ = tags_length1;
#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 2278 "PhotoMetadata.c"
+#line 2276 "PhotoMetadata.c"
}
default:
#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 2283 "PhotoMetadata.c"
+#line 2281 "PhotoMetadata.c"
}
#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = tags;
@@ -2289,7 +2287,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
if (_tmp11_ == NULL) {
#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = TRUE;
-#line 2293 "PhotoMetadata.c"
+#line 2291 "PhotoMetadata.c"
} else {
gchar** _tmp12_ = NULL;
gint _tmp12__length1 = 0;
@@ -2299,7 +2297,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tmp12__length1 = tags_length1;
#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = _tmp12__length1 == 0;
-#line 2303 "PhotoMetadata.c"
+#line 2301 "PhotoMetadata.c"
}
#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp10_) {
@@ -2317,7 +2315,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
compare_func_target_destroy_notify = NULL;
#line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2321 "PhotoMetadata.c"
+#line 2319 "PhotoMetadata.c"
}
#line 286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = compare_func;
@@ -2335,7 +2333,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tmp15_ = tags;
#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp15__length1 = tags_length1;
-#line 2339 "PhotoMetadata.c"
+#line 2337 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -2347,14 +2345,14 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
tag_collection_length1 = _tmp15__length1;
#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp15__length1; tag_it = tag_it + 1) {
-#line 2351 "PhotoMetadata.c"
+#line 2349 "PhotoMetadata.c"
gchar* _tmp16_ = NULL;
gchar* tag = NULL;
#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = g_strdup (tag_collection[tag_it]);
#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp16_;
-#line 2358 "PhotoMetadata.c"
+#line 2356 "PhotoMetadata.c"
{
GeeCollection* _tmp17_ = NULL;
const gchar* _tmp18_ = NULL;
@@ -2366,7 +2364,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
gee_collection_add (_tmp17_, _tmp18_);
#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 2370 "PhotoMetadata.c"
+#line 2368 "PhotoMetadata.c"
}
}
}
@@ -2384,14 +2382,14 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
compare_func_target_destroy_notify = NULL;
#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2388 "PhotoMetadata.c"
+#line 2386 "PhotoMetadata.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? g_object_ref (self) : NULL;
-#line 2395 "PhotoMetadata.c"
+#line 2393 "PhotoMetadata.c"
}
@@ -2441,7 +2439,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp4_ = exif_tags;
#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_ != NULL) {
-#line 2445 "PhotoMetadata.c"
+#line 2443 "PhotoMetadata.c"
GeeCollection* _tmp5_ = NULL;
gint _tmp6_ = 0;
gint _tmp7_ = 0;
@@ -2453,15 +2451,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp7_ = _tmp6_;
#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp7_ > 0;
-#line 2457 "PhotoMetadata.c"
+#line 2455 "PhotoMetadata.c"
} else {
#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = FALSE;
-#line 2461 "PhotoMetadata.c"
+#line 2459 "PhotoMetadata.c"
}
#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_) {
-#line 2465 "PhotoMetadata.c"
+#line 2463 "PhotoMetadata.c"
GeeCollection* _tmp8_ = NULL;
GeeCollection* _tmp9_ = NULL;
#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2470,7 +2468,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp9_ = exif_tags;
#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add_all (_tmp8_, _tmp9_);
-#line 2474 "PhotoMetadata.c"
+#line 2472 "PhotoMetadata.c"
}
#line 301 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = photo_metadata_get_tags (self, METADATA_DOMAIN_XMP, NULL, NULL, NULL);
@@ -2480,7 +2478,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp12_ = xmp_tags;
#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp12_ != NULL) {
-#line 2484 "PhotoMetadata.c"
+#line 2482 "PhotoMetadata.c"
GeeCollection* _tmp13_ = NULL;
gint _tmp14_ = 0;
gint _tmp15_ = 0;
@@ -2492,15 +2490,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp15_ = _tmp14_;
#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = _tmp15_ > 0;
-#line 2496 "PhotoMetadata.c"
+#line 2494 "PhotoMetadata.c"
} else {
#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = FALSE;
-#line 2500 "PhotoMetadata.c"
+#line 2498 "PhotoMetadata.c"
}
#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp11_) {
-#line 2504 "PhotoMetadata.c"
+#line 2502 "PhotoMetadata.c"
GeeCollection* _tmp16_ = NULL;
GeeCollection* _tmp17_ = NULL;
#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2509,7 +2507,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp17_ = xmp_tags;
#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add_all (_tmp16_, _tmp17_);
-#line 2513 "PhotoMetadata.c"
+#line 2511 "PhotoMetadata.c"
}
#line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = photo_metadata_get_tags (self, METADATA_DOMAIN_IPTC, NULL, NULL, NULL);
@@ -2519,7 +2517,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp20_ = iptc_tags;
#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp20_ != NULL) {
-#line 2523 "PhotoMetadata.c"
+#line 2521 "PhotoMetadata.c"
GeeCollection* _tmp21_ = NULL;
gint _tmp22_ = 0;
gint _tmp23_ = 0;
@@ -2531,15 +2529,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp23_ = _tmp22_;
#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = _tmp23_ > 0;
-#line 2535 "PhotoMetadata.c"
+#line 2533 "PhotoMetadata.c"
} else {
#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = FALSE;
-#line 2539 "PhotoMetadata.c"
+#line 2537 "PhotoMetadata.c"
}
#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp19_) {
-#line 2543 "PhotoMetadata.c"
+#line 2541 "PhotoMetadata.c"
GeeCollection* _tmp24_ = NULL;
GeeCollection* _tmp25_ = NULL;
#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -2548,7 +2546,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp25_ = iptc_tags;
#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add_all (_tmp24_, _tmp25_);
-#line 2552 "PhotoMetadata.c"
+#line 2550 "PhotoMetadata.c"
}
#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = all_tags;
@@ -2558,17 +2556,17 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp29_ = _tmp28_;
#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp29_ > 0) {
-#line 2562 "PhotoMetadata.c"
+#line 2560 "PhotoMetadata.c"
GeeCollection* _tmp30_ = NULL;
#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp30_ = all_tags;
#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp26_ = _tmp30_;
-#line 2568 "PhotoMetadata.c"
+#line 2566 "PhotoMetadata.c"
} else {
#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp26_ = NULL;
-#line 2572 "PhotoMetadata.c"
+#line 2570 "PhotoMetadata.c"
}
#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp31_ = _g_object_ref0 (_tmp26_);
@@ -2592,7 +2590,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
compare_func_target_destroy_notify = NULL;
#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2596 "PhotoMetadata.c"
+#line 2594 "PhotoMetadata.c"
}
@@ -2615,7 +2613,7 @@ gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) {
result = _tmp2_;
#line 313 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2619 "PhotoMetadata.c"
+#line 2617 "PhotoMetadata.c"
}
@@ -2638,7 +2636,7 @@ gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag
result = _tmp2_;
#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2642 "PhotoMetadata.c"
+#line 2640 "PhotoMetadata.c"
}
@@ -2675,7 +2673,7 @@ gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, Prepare
result = _tmp6_;
#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2679 "PhotoMetadata.c"
+#line 2677 "PhotoMetadata.c"
}
@@ -2712,7 +2710,7 @@ gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar*
result = _tmp6_;
#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2716 "PhotoMetadata.c"
+#line 2714 "PhotoMetadata.c"
}
@@ -2726,7 +2724,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
_tmp0_ = tags;
#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 2730 "PhotoMetadata.c"
+#line 2728 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -2738,14 +2736,14 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
tag_collection_length1 = _tmp0__length1;
#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 2742 "PhotoMetadata.c"
+#line 2740 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 2749 "PhotoMetadata.c"
+#line 2747 "PhotoMetadata.c"
{
gchar* value = NULL;
const gchar* _tmp2_ = NULL;
@@ -2767,13 +2765,13 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
_g_free0 (tag);
#line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2771 "PhotoMetadata.c"
+#line 2769 "PhotoMetadata.c"
}
#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (value);
#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 2777 "PhotoMetadata.c"
+#line 2775 "PhotoMetadata.c"
}
}
}
@@ -2781,7 +2779,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
result = NULL;
#line 335 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2785 "PhotoMetadata.c"
+#line 2783 "PhotoMetadata.c"
}
@@ -2795,7 +2793,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
_tmp0_ = tags;
#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 2799 "PhotoMetadata.c"
+#line 2797 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -2807,14 +2805,14 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
tag_collection_length1 = _tmp0__length1;
#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 2811 "PhotoMetadata.c"
+#line 2809 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 2818 "PhotoMetadata.c"
+#line 2816 "PhotoMetadata.c"
{
gchar* value = NULL;
const gchar* _tmp2_ = NULL;
@@ -2836,13 +2834,13 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
_g_free0 (tag);
#line 342 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2840 "PhotoMetadata.c"
+#line 2838 "PhotoMetadata.c"
}
#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (value);
#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 2846 "PhotoMetadata.c"
+#line 2844 "PhotoMetadata.c"
}
}
}
@@ -2850,7 +2848,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
result = NULL;
#line 345 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2854 "PhotoMetadata.c"
+#line 2852 "PhotoMetadata.c"
}
@@ -2901,7 +2899,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
if (_tmp5_ == NULL) {
#line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = TRUE;
-#line 2905 "PhotoMetadata.c"
+#line 2903 "PhotoMetadata.c"
} else {
gchar** _tmp6_ = NULL;
gint _tmp6__length1 = 0;
@@ -2911,7 +2909,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp6__length1 = values_length1;
#line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = _tmp6__length1 == 0;
-#line 2915 "PhotoMetadata.c"
+#line 2913 "PhotoMetadata.c"
}
#line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
@@ -2921,7 +2919,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
#line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 2925 "PhotoMetadata.c"
+#line 2923 "PhotoMetadata.c"
}
#line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
@@ -2935,7 +2933,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp9_ = values;
#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9__length1 = values_length1;
-#line 2939 "PhotoMetadata.c"
+#line 2937 "PhotoMetadata.c"
{
gchar** value_collection = NULL;
gint value_collection_length1 = 0;
@@ -2947,14 +2945,14 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
value_collection_length1 = _tmp9__length1;
#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (value_it = 0; value_it < _tmp9__length1; value_it = value_it + 1) {
-#line 2951 "PhotoMetadata.c"
+#line 2949 "PhotoMetadata.c"
gchar* _tmp10_ = NULL;
gchar* value = NULL;
#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = g_strdup (value_collection[value_it]);
#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value = _tmp10_;
-#line 2958 "PhotoMetadata.c"
+#line 2956 "PhotoMetadata.c"
{
gchar* prepped = NULL;
const gchar* _tmp11_ = NULL;
@@ -2971,7 +2969,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp14_ = prepped;
#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp14_ != NULL) {
-#line 2975 "PhotoMetadata.c"
+#line 2973 "PhotoMetadata.c"
GeeHashSet* _tmp15_ = NULL;
const gchar* _tmp16_ = NULL;
gboolean _tmp17_ = FALSE;
@@ -2983,15 +2981,15 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp17_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = !_tmp17_;
-#line 2987 "PhotoMetadata.c"
+#line 2985 "PhotoMetadata.c"
} else {
#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = FALSE;
-#line 2991 "PhotoMetadata.c"
+#line 2989 "PhotoMetadata.c"
}
#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp13_) {
-#line 2995 "PhotoMetadata.c"
+#line 2993 "PhotoMetadata.c"
GeeList* _tmp18_ = NULL;
const gchar* _tmp19_ = NULL;
GeeHashSet* _tmp20_ = NULL;
@@ -3008,13 +3006,13 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp21_ = prepped;
#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_);
-#line 3012 "PhotoMetadata.c"
+#line 3010 "PhotoMetadata.c"
}
#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (prepped);
#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (value);
-#line 3018 "PhotoMetadata.c"
+#line 3016 "PhotoMetadata.c"
}
}
}
@@ -3026,17 +3024,17 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp25_ = _tmp24_;
#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp25_ > 0) {
-#line 3030 "PhotoMetadata.c"
+#line 3028 "PhotoMetadata.c"
GeeList* _tmp26_ = NULL;
#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp26_ = list;
#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = _tmp26_;
-#line 3036 "PhotoMetadata.c"
+#line 3034 "PhotoMetadata.c"
} else {
#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = NULL;
-#line 3040 "PhotoMetadata.c"
+#line 3038 "PhotoMetadata.c"
}
#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = _g_object_ref0 (_tmp22_);
@@ -3050,7 +3048,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3054 "PhotoMetadata.c"
+#line 3052 "PhotoMetadata.c"
}
@@ -3064,7 +3062,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
_tmp0_ = tags;
#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 3068 "PhotoMetadata.c"
+#line 3066 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -3076,14 +3074,14 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
tag_collection_length1 = _tmp0__length1;
#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3080 "PhotoMetadata.c"
+#line 3078 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 3087 "PhotoMetadata.c"
+#line 3085 "PhotoMetadata.c"
{
GeeList* values = NULL;
const gchar* _tmp2_ = NULL;
@@ -3100,7 +3098,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
_tmp5_ = values;
#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp5_ != NULL) {
-#line 3104 "PhotoMetadata.c"
+#line 3102 "PhotoMetadata.c"
GeeList* _tmp6_ = NULL;
gint _tmp7_ = 0;
gint _tmp8_ = 0;
@@ -3112,11 +3110,11 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
_tmp8_ = _tmp7_;
#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = _tmp8_ > 0;
-#line 3116 "PhotoMetadata.c"
+#line 3114 "PhotoMetadata.c"
} else {
#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = FALSE;
-#line 3120 "PhotoMetadata.c"
+#line 3118 "PhotoMetadata.c"
}
#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
@@ -3126,13 +3124,13 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
_g_free0 (tag);
#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3130 "PhotoMetadata.c"
+#line 3128 "PhotoMetadata.c"
}
#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 3136 "PhotoMetadata.c"
+#line 3134 "PhotoMetadata.c"
}
}
}
@@ -3140,7 +3138,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
result = NULL;
#line 388 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3144 "PhotoMetadata.c"
+#line 3142 "PhotoMetadata.c"
}
@@ -3172,7 +3170,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
_tmp3_ = prepped;
#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_ == NULL) {
-#line 3176 "PhotoMetadata.c"
+#line 3174 "PhotoMetadata.c"
const gchar* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3185,7 +3183,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
_g_free0 (prepped);
#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 3189 "PhotoMetadata.c"
+#line 3187 "PhotoMetadata.c"
}
#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = self->priv->exiv2;
@@ -3197,7 +3195,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
_tmp9_ = gexiv2_metadata_set_tag_string (_tmp6_, _tmp7_, _tmp8_);
#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp9_) {
-#line 3201 "PhotoMetadata.c"
+#line 3199 "PhotoMetadata.c"
const gchar* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
const gchar* _tmp12_ = NULL;
@@ -3210,11 +3208,11 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_warning ("PhotoMetadata.vala:400: Unable to set tag %s to string %s from source " \
"%s", _tmp10_, _tmp11_, _tmp12_);
-#line 3213 "PhotoMetadata.c"
+#line 3211 "PhotoMetadata.c"
}
#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (prepped);
-#line 3217 "PhotoMetadata.c"
+#line 3215 "PhotoMetadata.c"
}
@@ -3233,7 +3231,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp0_ = tags;
#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 3236 "PhotoMetadata.c"
+#line 3234 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -3245,14 +3243,14 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
tag_collection_length1 = _tmp0__length1;
#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3248 "PhotoMetadata.c"
+#line 3246 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 3255 "PhotoMetadata.c"
+#line 3253 "PhotoMetadata.c"
{
gboolean _tmp2_ = FALSE;
PhotoMetadataSetOption _tmp3_ = 0;
@@ -3262,7 +3260,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
if (_tmp3_ == PHOTO_METADATA_SET_OPTION_ALL_DOMAINS) {
#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = TRUE;
-#line 3265 "PhotoMetadata.c"
+#line 3263 "PhotoMetadata.c"
} else {
const gchar* _tmp4_ = NULL;
MetadataDomain _tmp5_ = 0;
@@ -3275,11 +3273,11 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp6_ = photo_metadata_has_domain (self, _tmp5_);
#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = _tmp6_;
-#line 3278 "PhotoMetadata.c"
+#line 3276 "PhotoMetadata.c"
}
#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_) {
-#line 3282 "PhotoMetadata.c"
+#line 3280 "PhotoMetadata.c"
PhotoMetadataSetGenericValue _tmp7_ = NULL;
void* _tmp7__target = NULL;
const gchar* _tmp8_ = NULL;
@@ -3293,11 +3291,11 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp7_ (_tmp8_, _tmp7__target);
#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
written = TRUE;
-#line 3296 "PhotoMetadata.c"
+#line 3294 "PhotoMetadata.c"
}
#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 3300 "PhotoMetadata.c"
+#line 3298 "PhotoMetadata.c"
}
}
}
@@ -3305,21 +3303,21 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp11_ = option;
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp11_ == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) {
-#line 3308 "PhotoMetadata.c"
+#line 3306 "PhotoMetadata.c"
gboolean _tmp12_ = FALSE;
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp12_ = written;
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = !_tmp12_;
-#line 3314 "PhotoMetadata.c"
+#line 3312 "PhotoMetadata.c"
} else {
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = FALSE;
-#line 3318 "PhotoMetadata.c"
+#line 3316 "PhotoMetadata.c"
}
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp10_) {
-#line 3322 "PhotoMetadata.c"
+#line 3320 "PhotoMetadata.c"
gchar** _tmp13_ = NULL;
gint _tmp13__length1 = 0;
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3328,15 +3326,15 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp13__length1 = tags_length1;
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = _tmp13__length1 > 0;
-#line 3331 "PhotoMetadata.c"
+#line 3329 "PhotoMetadata.c"
} else {
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = FALSE;
-#line 3335 "PhotoMetadata.c"
+#line 3333 "PhotoMetadata.c"
}
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp9_) {
-#line 3339 "PhotoMetadata.c"
+#line 3337 "PhotoMetadata.c"
MetadataDomain default_domain = 0;
gchar** _tmp14_ = NULL;
gint _tmp14__length1 = 0;
@@ -3369,19 +3367,19 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp19_ = _tmp18_[0];
#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp17_ (_tmp19_, _tmp17__target);
-#line 3372 "PhotoMetadata.c"
+#line 3370 "PhotoMetadata.c"
{
gint ctr = 0;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
ctr = 1;
-#line 3377 "PhotoMetadata.c"
+#line 3375 "PhotoMetadata.c"
{
gboolean _tmp20_ = FALSE;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = TRUE;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 3384 "PhotoMetadata.c"
+#line 3382 "PhotoMetadata.c"
gint _tmp22_ = 0;
gchar** _tmp23_ = NULL;
gint _tmp23__length1 = 0;
@@ -3393,13 +3391,13 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
MetadataDomain _tmp28_ = 0;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp20_) {
-#line 3396 "PhotoMetadata.c"
+#line 3394 "PhotoMetadata.c"
gint _tmp21_ = 0;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp21_ = ctr;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
ctr = _tmp21_ + 1;
-#line 3402 "PhotoMetadata.c"
+#line 3400 "PhotoMetadata.c"
}
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = FALSE;
@@ -3413,7 +3411,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
if (!(_tmp22_ < _tmp23__length1)) {
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 3416 "PhotoMetadata.c"
+#line 3414 "PhotoMetadata.c"
}
#line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp24_ = tags;
@@ -3429,7 +3427,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp28_ = default_domain;
#line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp27_ == _tmp28_) {
-#line 3432 "PhotoMetadata.c"
+#line 3430 "PhotoMetadata.c"
PhotoMetadataSetGenericValue _tmp29_ = NULL;
void* _tmp29__target = NULL;
gchar** _tmp30_ = NULL;
@@ -3450,7 +3448,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp32_ = _tmp30_[_tmp31_];
#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp29_ (_tmp32_, _tmp29__target);
-#line 3453 "PhotoMetadata.c"
+#line 3451 "PhotoMetadata.c"
}
}
}
@@ -3464,7 +3462,7 @@ static Block1Data* block1_data_ref (Block1Data* _data1_) {
g_atomic_int_inc (&_data1_->_ref_count_);
#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data1_;
-#line 3467 "PhotoMetadata.c"
+#line 3465 "PhotoMetadata.c"
}
@@ -3473,7 +3471,7 @@ static void block1_data_unref (void * _userdata_) {
_data1_ = (Block1Data*) _userdata_;
#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 3476 "PhotoMetadata.c"
+#line 3474 "PhotoMetadata.c"
PhotoMetadata* self;
#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data1_->self;
@@ -3483,7 +3481,7 @@ static void block1_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block1Data, _data1_);
-#line 3486 "PhotoMetadata.c"
+#line 3484 "PhotoMetadata.c"
}
}
@@ -3502,14 +3500,14 @@ static void __lambda5_ (Block1Data* _data1_, const gchar* tag) {
_tmp1_ = _data1_->value;
#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 3505 "PhotoMetadata.c"
+#line 3503 "PhotoMetadata.c"
}
static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda5_ (self, tag);
-#line 3512 "PhotoMetadata.c"
+#line 3510 "PhotoMetadata.c"
}
@@ -3550,7 +3548,7 @@ void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_
block1_data_unref (_data1_);
#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data1_ = NULL;
-#line 3553 "PhotoMetadata.c"
+#line 3551 "PhotoMetadata.c"
}
@@ -3561,13 +3559,13 @@ static void _vala_array_add45 (gchar*** array, int* length, int* size, gchar* va
*size = (*size) ? (2 * (*size)) : 4;
#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 3564 "PhotoMetadata.c"
+#line 3562 "PhotoMetadata.c"
}
#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(*array)[(*length)++] = value;
#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(*array)[*length] = NULL;
-#line 3570 "PhotoMetadata.c"
+#line 3568 "PhotoMetadata.c"
}
@@ -3578,13 +3576,13 @@ static void _vala_array_add46 (gchar*** array, int* length, int* size, gchar* va
*size = (*size) ? (2 * (*size)) : 4;
#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 3581 "PhotoMetadata.c"
+#line 3579 "PhotoMetadata.c"
}
#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(*array)[(*length)++] = value;
#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(*array)[*length] = NULL;
-#line 3587 "PhotoMetadata.c"
+#line 3585 "PhotoMetadata.c"
}
@@ -3616,7 +3614,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
values_length1 = 0;
#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_values_size_ = values_length1;
-#line 3619 "PhotoMetadata.c"
+#line 3617 "PhotoMetadata.c"
{
GeeIterator* _value_it = NULL;
GeeCollection* _tmp1_ = NULL;
@@ -3629,7 +3627,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_value_it = _tmp2_;
#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 3632 "PhotoMetadata.c"
+#line 3630 "PhotoMetadata.c"
GeeIterator* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
gchar* value = NULL;
@@ -3647,7 +3645,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
if (!_tmp4_) {
#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 3650 "PhotoMetadata.c"
+#line 3648 "PhotoMetadata.c"
}
#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _value_it;
@@ -3665,7 +3663,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_tmp9_ = prepped;
#line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp9_ != NULL) {
-#line 3668 "PhotoMetadata.c"
+#line 3666 "PhotoMetadata.c"
gchar** _tmp10_ = NULL;
gint _tmp10__length1 = 0;
const gchar* _tmp11_ = NULL;
@@ -3680,7 +3678,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_tmp12_ = g_strdup (_tmp11_);
#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_array_add45 (&values, &values_length1, &_values_size_, _tmp12_);
-#line 3683 "PhotoMetadata.c"
+#line 3681 "PhotoMetadata.c"
} else {
const gchar* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
@@ -3690,17 +3688,17 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_tmp14_ = tag;
#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_warning ("PhotoMetadata.vala:439: Unable to set string %s to %s: invalid UTF-8", _tmp13_, _tmp14_);
-#line 3693 "PhotoMetadata.c"
+#line 3691 "PhotoMetadata.c"
}
#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (prepped);
#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (value);
-#line 3699 "PhotoMetadata.c"
+#line 3697 "PhotoMetadata.c"
}
#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_value_it);
-#line 3703 "PhotoMetadata.c"
+#line 3701 "PhotoMetadata.c"
}
#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp15_ = values;
@@ -3712,7 +3710,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
#line 443 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 3715 "PhotoMetadata.c"
+#line 3713 "PhotoMetadata.c"
}
#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = values;
@@ -3732,7 +3730,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_tmp20_ = gexiv2_metadata_set_tag_multiple (_tmp17_, _tmp18_, _tmp19_);
#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp20_) {
-#line 3735 "PhotoMetadata.c"
+#line 3733 "PhotoMetadata.c"
gchar** _tmp21_ = NULL;
gint _tmp21__length1 = 0;
const gchar* _tmp22_ = NULL;
@@ -3748,11 +3746,11 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_warning ("PhotoMetadata.vala:452: Unable to set %d strings to tag %s from source" \
" %s", _tmp21__length1, _tmp22_, _tmp23_);
-#line 3750 "PhotoMetadata.c"
+#line 3748 "PhotoMetadata.c"
}
#line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 3754 "PhotoMetadata.c"
+#line 3752 "PhotoMetadata.c"
}
@@ -3761,7 +3759,7 @@ static Block2Data* block2_data_ref (Block2Data* _data2_) {
g_atomic_int_inc (&_data2_->_ref_count_);
#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data2_;
-#line 3763 "PhotoMetadata.c"
+#line 3761 "PhotoMetadata.c"
}
@@ -3770,7 +3768,7 @@ static void block2_data_unref (void * _userdata_) {
_data2_ = (Block2Data*) _userdata_;
#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
-#line 3772 "PhotoMetadata.c"
+#line 3770 "PhotoMetadata.c"
PhotoMetadata* self;
#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data2_->self;
@@ -3780,7 +3778,7 @@ static void block2_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block2Data, _data2_);
-#line 3782 "PhotoMetadata.c"
+#line 3780 "PhotoMetadata.c"
}
}
@@ -3799,14 +3797,14 @@ static void __lambda6_ (Block2Data* _data2_, const gchar* tag) {
_tmp1_ = _data2_->values;
#line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string_multiple (self, _tmp0_, _tmp1_);
-#line 3801 "PhotoMetadata.c"
+#line 3799 "PhotoMetadata.c"
}
static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda6_ (self, tag);
-#line 3808 "PhotoMetadata.c"
+#line 3806 "PhotoMetadata.c"
}
@@ -3847,7 +3845,7 @@ void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags,
block2_data_unref (_data2_);
#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data2_ = NULL;
-#line 3849 "PhotoMetadata.c"
+#line 3847 "PhotoMetadata.c"
}
@@ -3877,11 +3875,11 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong*
if (value) {
#line 463 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*value = _vala_value;
-#line 3879 "PhotoMetadata.c"
+#line 3877 "PhotoMetadata.c"
}
#line 463 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3883 "PhotoMetadata.c"
+#line 3881 "PhotoMetadata.c"
}
#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = self->priv->exiv2;
@@ -3897,11 +3895,11 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong*
if (value) {
#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*value = _vala_value;
-#line 3899 "PhotoMetadata.c"
+#line 3897 "PhotoMetadata.c"
}
#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3903 "PhotoMetadata.c"
+#line 3901 "PhotoMetadata.c"
}
@@ -3916,7 +3914,7 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
_tmp0_ = tags;
#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 3918 "PhotoMetadata.c"
+#line 3916 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -3928,14 +3926,14 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
tag_collection_length1 = _tmp0__length1;
#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3930 "PhotoMetadata.c"
+#line 3928 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 3937 "PhotoMetadata.c"
+#line 3935 "PhotoMetadata.c"
{
const gchar* _tmp2_ = NULL;
glong _tmp3_ = 0L;
@@ -3956,15 +3954,15 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
if (value) {
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*value = _vala_value;
-#line 3958 "PhotoMetadata.c"
+#line 3956 "PhotoMetadata.c"
}
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3962 "PhotoMetadata.c"
+#line 3960 "PhotoMetadata.c"
}
#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 3966 "PhotoMetadata.c"
+#line 3964 "PhotoMetadata.c"
}
}
}
@@ -3976,11 +3974,11 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
if (value) {
#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*value = _vala_value;
-#line 3978 "PhotoMetadata.c"
+#line 3976 "PhotoMetadata.c"
}
#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3982 "PhotoMetadata.c"
+#line 3980 "PhotoMetadata.c"
}
@@ -4003,7 +4001,7 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value
_tmp3_ = gexiv2_metadata_set_tag_long (_tmp0_, _tmp1_, _tmp2_);
#line 483 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp3_) {
-#line 4005 "PhotoMetadata.c"
+#line 4003 "PhotoMetadata.c"
const gchar* _tmp4_ = NULL;
glong _tmp5_ = 0L;
const gchar* _tmp6_ = NULL;
@@ -4016,7 +4014,7 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value
#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_warning ("PhotoMetadata.vala:484: Unable to set tag %s to long %ld from source %" \
"s", _tmp4_, _tmp5_, _tmp6_);
-#line 4017 "PhotoMetadata.c"
+#line 4015 "PhotoMetadata.c"
}
}
@@ -4026,7 +4024,7 @@ static Block3Data* block3_data_ref (Block3Data* _data3_) {
g_atomic_int_inc (&_data3_->_ref_count_);
#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data3_;
-#line 4027 "PhotoMetadata.c"
+#line 4025 "PhotoMetadata.c"
}
@@ -4035,7 +4033,7 @@ static void block3_data_unref (void * _userdata_) {
_data3_ = (Block3Data*) _userdata_;
#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
-#line 4036 "PhotoMetadata.c"
+#line 4034 "PhotoMetadata.c"
PhotoMetadata* self;
#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data3_->self;
@@ -4043,7 +4041,7 @@ static void block3_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block3Data, _data3_);
-#line 4044 "PhotoMetadata.c"
+#line 4042 "PhotoMetadata.c"
}
}
@@ -4062,14 +4060,14 @@ static void __lambda7_ (Block3Data* _data3_, const gchar* tag) {
_tmp1_ = _data3_->value;
#line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_long (self, _tmp0_, _tmp1_);
-#line 4063 "PhotoMetadata.c"
+#line 4061 "PhotoMetadata.c"
}
static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda7_ (self, tag);
-#line 4070 "PhotoMetadata.c"
+#line 4068 "PhotoMetadata.c"
}
@@ -4103,7 +4101,7 @@ void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_le
block3_data_unref (_data3_);
#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data3_ = NULL;
-#line 4104 "PhotoMetadata.c"
+#line 4102 "PhotoMetadata.c"
}
@@ -4142,11 +4140,11 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met
if (rational) {
#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*rational = _vala_rational;
-#line 4143 "PhotoMetadata.c"
+#line 4141 "PhotoMetadata.c"
}
#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4147 "PhotoMetadata.c"
+#line 4145 "PhotoMetadata.c"
}
@@ -4161,7 +4159,7 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
_tmp0_ = tags;
#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 4162 "PhotoMetadata.c"
+#line 4160 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -4173,14 +4171,14 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
tag_collection_length1 = _tmp0__length1;
#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4174 "PhotoMetadata.c"
+#line 4172 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 4181 "PhotoMetadata.c"
+#line 4179 "PhotoMetadata.c"
{
const gchar* _tmp2_ = NULL;
MetadataRational _tmp3_ = {0};
@@ -4201,15 +4199,15 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
if (rational) {
#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*rational = _vala_rational;
-#line 4202 "PhotoMetadata.c"
+#line 4200 "PhotoMetadata.c"
}
#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4206 "PhotoMetadata.c"
+#line 4204 "PhotoMetadata.c"
}
#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 4210 "PhotoMetadata.c"
+#line 4208 "PhotoMetadata.c"
}
}
}
@@ -4221,11 +4219,11 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
if (rational) {
#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*rational = _vala_rational;
-#line 4222 "PhotoMetadata.c"
+#line 4220 "PhotoMetadata.c"
}
#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4226 "PhotoMetadata.c"
+#line 4224 "PhotoMetadata.c"
}
@@ -4259,7 +4257,7 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat
_tmp6_ = gexiv2_metadata_set_exif_tag_rational (_tmp0_, _tmp1_, _tmp3_, _tmp5_);
#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp6_) {
-#line 4260 "PhotoMetadata.c"
+#line 4258 "PhotoMetadata.c"
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
@@ -4277,7 +4275,7 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat
"e %s", _tmp7_, _tmp9_, _tmp10_);
#line 513 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp9_);
-#line 4277 "PhotoMetadata.c"
+#line 4275 "PhotoMetadata.c"
}
}
@@ -4287,7 +4285,7 @@ static Block4Data* block4_data_ref (Block4Data* _data4_) {
g_atomic_int_inc (&_data4_->_ref_count_);
#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data4_;
-#line 4287 "PhotoMetadata.c"
+#line 4285 "PhotoMetadata.c"
}
@@ -4296,7 +4294,7 @@ static void block4_data_unref (void * _userdata_) {
_data4_ = (Block4Data*) _userdata_;
#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) {
-#line 4296 "PhotoMetadata.c"
+#line 4294 "PhotoMetadata.c"
PhotoMetadata* self;
#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data4_->self;
@@ -4304,7 +4302,7 @@ static void block4_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block4Data, _data4_);
-#line 4304 "PhotoMetadata.c"
+#line 4302 "PhotoMetadata.c"
}
}
@@ -4323,14 +4321,14 @@ static void __lambda8_ (Block4Data* _data4_, const gchar* tag) {
_tmp1_ = _data4_->rational;
#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_rational (self, _tmp0_, &_tmp1_);
-#line 4323 "PhotoMetadata.c"
+#line 4321 "PhotoMetadata.c"
}
static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda8_ (self, tag);
-#line 4330 "PhotoMetadata.c"
+#line 4328 "PhotoMetadata.c"
}
@@ -4366,7 +4364,7 @@ void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tag
block4_data_unref (_data4_);
#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data4_ = NULL;
-#line 4366 "PhotoMetadata.c"
+#line 4364 "PhotoMetadata.c"
}
@@ -4397,7 +4395,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4397 "PhotoMetadata.c"
+#line 4395 "PhotoMetadata.c"
}
{
const gchar* _tmp3_ = NULL;
@@ -4410,7 +4408,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
switch (_tmp4_) {
#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 4410 "PhotoMetadata.c"
+#line 4408 "PhotoMetadata.c"
{
MetadataDateTime* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
@@ -4424,7 +4422,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_tmp5_ = _tmp7_;
#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4424 "PhotoMetadata.c"
+#line 4422 "PhotoMetadata.c"
goto __catch24_g_error;
}
#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4439,11 +4437,11 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4439 "PhotoMetadata.c"
+#line 4437 "PhotoMetadata.c"
}
#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 4443 "PhotoMetadata.c"
+#line 4441 "PhotoMetadata.c"
{
#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = NULL;
@@ -4451,12 +4449,12 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4451 "PhotoMetadata.c"
+#line 4449 "PhotoMetadata.c"
}
default:
#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 4456 "PhotoMetadata.c"
+#line 4454 "PhotoMetadata.c"
{
MetadataDateTime* _tmp9_ = NULL;
const gchar* _tmp10_ = NULL;
@@ -4470,7 +4468,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_tmp9_ = _tmp11_;
#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4470 "PhotoMetadata.c"
+#line 4468 "PhotoMetadata.c"
goto __catch24_g_error;
}
#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4485,7 +4483,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4485 "PhotoMetadata.c"
+#line 4483 "PhotoMetadata.c"
}
}
}
@@ -4519,7 +4517,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4519 "PhotoMetadata.c"
+#line 4517 "PhotoMetadata.c"
}
__finally24:
#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4530,7 +4528,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
g_clear_error (&_inner_error_);
#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 4530 "PhotoMetadata.c"
+#line 4528 "PhotoMetadata.c"
}
@@ -4544,7 +4542,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
_tmp0_ = tags;
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 4544 "PhotoMetadata.c"
+#line 4542 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -4556,14 +4554,14 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
tag_collection_length1 = _tmp0__length1;
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4556 "PhotoMetadata.c"
+#line 4554 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 4563 "PhotoMetadata.c"
+#line 4561 "PhotoMetadata.c"
{
MetadataDateTime* date_time = NULL;
const gchar* _tmp2_ = NULL;
@@ -4585,13 +4583,13 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
_g_free0 (tag);
#line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4585 "PhotoMetadata.c"
+#line 4583 "PhotoMetadata.c"
}
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_metadata_date_time_unref0 (date_time);
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 4591 "PhotoMetadata.c"
+#line 4589 "PhotoMetadata.c"
}
}
}
@@ -4599,7 +4597,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
result = NULL;
#line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4599 "PhotoMetadata.c"
+#line 4597 "PhotoMetadata.c"
}
@@ -4620,7 +4618,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
switch (_tmp1_) {
#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 4620 "PhotoMetadata.c"
+#line 4618 "PhotoMetadata.c"
{
const gchar* _tmp2_ = NULL;
MetadataDateTime* _tmp3_ = NULL;
@@ -4640,11 +4638,11 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
_g_free0 (_tmp5_);
#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 4640 "PhotoMetadata.c"
+#line 4638 "PhotoMetadata.c"
}
#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 4644 "PhotoMetadata.c"
+#line 4642 "PhotoMetadata.c"
{
const gchar* _tmp6_ = NULL;
MetadataDateTime* _tmp7_ = NULL;
@@ -4664,12 +4662,12 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
_g_free0 (_tmp9_);
#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 4664 "PhotoMetadata.c"
+#line 4662 "PhotoMetadata.c"
}
default:
#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 4669 "PhotoMetadata.c"
+#line 4667 "PhotoMetadata.c"
{
const gchar* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
@@ -4691,7 +4689,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
"supported metadata domain %s", _tmp10_, _tmp11_, (_tmp14_ != NULL) ? _tmp14_->value_name : NULL);
#line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 4690 "PhotoMetadata.c"
+#line 4688 "PhotoMetadata.c"
}
}
}
@@ -4700,7 +4698,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
static gpointer _metadata_date_time_ref0 (gpointer self) {
#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? metadata_date_time_ref (self) : NULL;
-#line 4699 "PhotoMetadata.c"
+#line 4697 "PhotoMetadata.c"
}
@@ -4709,7 +4707,7 @@ static Block5Data* block5_data_ref (Block5Data* _data5_) {
g_atomic_int_inc (&_data5_->_ref_count_);
#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data5_;
-#line 4708 "PhotoMetadata.c"
+#line 4706 "PhotoMetadata.c"
}
@@ -4718,7 +4716,7 @@ static void block5_data_unref (void * _userdata_) {
_data5_ = (Block5Data*) _userdata_;
#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) {
-#line 4717 "PhotoMetadata.c"
+#line 4715 "PhotoMetadata.c"
PhotoMetadata* self;
#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data5_->self;
@@ -4728,7 +4726,7 @@ static void block5_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block5Data, _data5_);
-#line 4727 "PhotoMetadata.c"
+#line 4725 "PhotoMetadata.c"
}
}
@@ -4747,14 +4745,14 @@ static void __lambda9_ (Block5Data* _data5_, const gchar* tag) {
_tmp1_ = _data5_->date_time;
#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_date_time (self, _tmp0_, _tmp1_);
-#line 4746 "PhotoMetadata.c"
+#line 4744 "PhotoMetadata.c"
}
static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda9_ (self, tag);
-#line 4753 "PhotoMetadata.c"
+#line 4751 "PhotoMetadata.c"
}
@@ -4795,7 +4793,7 @@ void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int ta
block5_data_unref (_data5_);
#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data5_ = NULL;
-#line 4794 "PhotoMetadata.c"
+#line 4792 "PhotoMetadata.c"
}
@@ -4829,7 +4827,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
_tmp0_ = self->priv->exif;
#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ == NULL) {
-#line 4828 "PhotoMetadata.c"
+#line 4826 "PhotoMetadata.c"
guint8* _tmp1_ = NULL;
gint _tmp1__length1 = 0;
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4840,13 +4838,13 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
if (result_length1) {
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*result_length1 = _tmp1__length1;
-#line 4839 "PhotoMetadata.c"
+#line 4837 "PhotoMetadata.c"
}
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp1_;
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4845 "PhotoMetadata.c"
+#line 4843 "PhotoMetadata.c"
}
#line 588 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = self->priv->exif;
@@ -4864,7 +4862,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
_tmp6_ = include_preview;
#line 590 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp6_) {
-#line 4863 "PhotoMetadata.c"
+#line 4861 "PhotoMetadata.c"
ExifData* _tmp7_ = NULL;
ExifData* _tmp8_ = NULL;
#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4875,7 +4873,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
_tmp8_ = self->priv->exif;
#line 592 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_->size = (guint) 0;
-#line 4874 "PhotoMetadata.c"
+#line 4872 "PhotoMetadata.c"
}
#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
flattened = NULL;
@@ -4895,21 +4893,21 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
_tmp11_ = saved_size;
#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp11_ > ((guint) 0)) {
-#line 4894 "PhotoMetadata.c"
+#line 4892 "PhotoMetadata.c"
guchar* _tmp12_ = NULL;
#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp12_ = saved_data;
#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = _tmp12_ != NULL;
-#line 4900 "PhotoMetadata.c"
+#line 4898 "PhotoMetadata.c"
} else {
#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = FALSE;
-#line 4904 "PhotoMetadata.c"
+#line 4902 "PhotoMetadata.c"
}
#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp10_) {
-#line 4908 "PhotoMetadata.c"
+#line 4906 "PhotoMetadata.c"
guint _tmp13_ = 0U;
guint8* _tmp14_ = NULL;
guint8* _tmp15_ = NULL;
@@ -4951,7 +4949,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
exif_mem_free (_tmp19_, _tmp20_);
#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_exif_mem_unref0 (_tmp19_);
-#line 4950 "PhotoMetadata.c"
+#line 4948 "PhotoMetadata.c"
}
#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp21_ = self->priv->exif;
@@ -4973,20 +4971,20 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
if (result_length1) {
#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*result_length1 = _tmp25__length1;
-#line 4972 "PhotoMetadata.c"
+#line 4970 "PhotoMetadata.c"
}
#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp25_;
#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4978 "PhotoMetadata.c"
+#line 4976 "PhotoMetadata.c"
}
static guint8* _vala_array_dup5 (guint8* self, int length) {
#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_memdup (self, length * sizeof (guint8));
-#line 4985 "PhotoMetadata.c"
+#line 4983 "PhotoMetadata.c"
}
@@ -4999,7 +4997,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
gint _tmp0__length1 = 0;
gint __tmp0__size_ = 0;
GExiv2Metadata* _tmp1_ = NULL;
- guchar* _tmp2_ = NULL;
+ guint8* _tmp2_ = NULL;
gint _tmp3_ = 0;
gboolean _tmp4_ = FALSE;
guint8* _tmp6_ = NULL;
@@ -5022,7 +5020,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
_buffer_size_ = buffer_length1;
#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
-#line 5021 "PhotoMetadata.c"
+#line 5019 "PhotoMetadata.c"
guchar* _tmp5_ = NULL;
gint _tmp5__length1 = 0;
#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5035,7 +5033,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
_tmp0__length1 = _tmp5__length1;
#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__tmp0__size_ = _tmp0__length1;
-#line 5034 "PhotoMetadata.c"
+#line 5032 "PhotoMetadata.c"
} else {
#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = NULL;
@@ -5043,7 +5041,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
_tmp0__length1 = 0;
#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__tmp0__size_ = _tmp0__length1;
-#line 5042 "PhotoMetadata.c"
+#line 5040 "PhotoMetadata.c"
}
#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
@@ -5057,7 +5055,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
if (result_length1) {
#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*result_length1 = _tmp7__length1;
-#line 5056 "PhotoMetadata.c"
+#line 5054 "PhotoMetadata.c"
}
#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp7_;
@@ -5065,7 +5063,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
buffer = (g_free (buffer), NULL);
#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5064 "PhotoMetadata.c"
+#line 5062 "PhotoMetadata.c"
}
@@ -5098,7 +5096,7 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
_tmp4__length1 = props_length1;
#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_ != NULL) {
-#line 5097 "PhotoMetadata.c"
+#line 5095 "PhotoMetadata.c"
GExiv2PreviewProperties** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5107,17 +5105,17 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
_tmp5__length1 = props_length1;
#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp5__length1;
-#line 5106 "PhotoMetadata.c"
+#line 5104 "PhotoMetadata.c"
} else {
#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = 0;
-#line 5110 "PhotoMetadata.c"
+#line 5108 "PhotoMetadata.c"
}
#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = (guint) _tmp3_;
#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5116 "PhotoMetadata.c"
+#line 5114 "PhotoMetadata.c"
}
@@ -5159,7 +5157,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
if (_tmp4_ == NULL) {
#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = TRUE;
-#line 5158 "PhotoMetadata.c"
+#line 5156 "PhotoMetadata.c"
} else {
GExiv2PreviewProperties** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
@@ -5172,7 +5170,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
_tmp6_ = number;
#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = ((guint) _tmp5__length1) <= _tmp6_;
-#line 5171 "PhotoMetadata.c"
+#line 5169 "PhotoMetadata.c"
}
#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_) {
@@ -5180,7 +5178,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
result = NULL;
#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5179 "PhotoMetadata.c"
+#line 5177 "PhotoMetadata.c"
}
#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = self->priv->source_name;
@@ -5200,7 +5198,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_PREVIEW, PhotoPreview);
#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5199 "PhotoMetadata.c"
+#line 5197 "PhotoMetadata.c"
}
@@ -5217,7 +5215,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
_tmp1_ = self->priv->exif;
#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp1_ != NULL) {
-#line 5216 "PhotoMetadata.c"
+#line 5214 "PhotoMetadata.c"
ExifMem* _tmp2_ = NULL;
ExifMem* _tmp3_ = NULL;
ExifData* _tmp4_ = NULL;
@@ -5244,7 +5242,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
_tmp7_ = self->priv->exif;
#line 641 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_->size = (guint) 0;
-#line 5243 "PhotoMetadata.c"
+#line 5241 "PhotoMetadata.c"
}
}
@@ -5262,7 +5260,7 @@ void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) {
_tmp1_ = tag;
#line 646 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gexiv2_metadata_clear_tag (_tmp0_, _tmp1_);
-#line 5261 "PhotoMetadata.c"
+#line 5259 "PhotoMetadata.c"
}
@@ -5275,7 +5273,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
_tmp0_ = tags;
#line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 5274 "PhotoMetadata.c"
+#line 5272 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -5287,14 +5285,14 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
tag_collection_length1 = _tmp0__length1;
#line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 5286 "PhotoMetadata.c"
+#line 5284 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 5293 "PhotoMetadata.c"
+#line 5291 "PhotoMetadata.c"
{
const gchar* _tmp2_ = NULL;
#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5303,7 +5301,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
photo_metadata_remove_tag (self, _tmp2_);
#line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 5302 "PhotoMetadata.c"
+#line 5300 "PhotoMetadata.c"
}
}
}
@@ -5320,7 +5318,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
switch (_tmp0_) {
#line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 5319 "PhotoMetadata.c"
+#line 5317 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp1_ = NULL;
#line 657 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5329,11 +5327,11 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
gexiv2_metadata_clear_exif (_tmp1_);
#line 658 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 5328 "PhotoMetadata.c"
+#line 5326 "PhotoMetadata.c"
}
#line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 5332 "PhotoMetadata.c"
+#line 5330 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp2_ = NULL;
#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5342,11 +5340,11 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
gexiv2_metadata_clear_xmp (_tmp2_);
#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 5341 "PhotoMetadata.c"
+#line 5339 "PhotoMetadata.c"
}
#line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 5345 "PhotoMetadata.c"
+#line 5343 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp3_ = NULL;
#line 665 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5355,12 +5353,12 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
gexiv2_metadata_clear_iptc (_tmp3_);
#line 666 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 5354 "PhotoMetadata.c"
+#line 5352 "PhotoMetadata.c"
}
default:
#line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 5359 "PhotoMetadata.c"
+#line 5357 "PhotoMetadata.c"
}
}
@@ -5373,7 +5371,7 @@ void photo_metadata_clear (PhotoMetadata* self) {
_tmp0_ = self->priv->exiv2;
#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gexiv2_metadata_clear (_tmp0_);
-#line 5372 "PhotoMetadata.c"
+#line 5370 "PhotoMetadata.c"
}
@@ -5394,7 +5392,7 @@ MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self
result = _tmp1_;
#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5393 "PhotoMetadata.c"
+#line 5391 "PhotoMetadata.c"
}
@@ -5408,7 +5406,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
_tmp0_ = date_time;
#line 686 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ != NULL) {
-#line 5407 "PhotoMetadata.c"
+#line 5405 "PhotoMetadata.c"
gchar** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
MetadataDateTime* _tmp2_ = NULL;
@@ -5423,7 +5421,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
_tmp3_ = option;
#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 5422 "PhotoMetadata.c"
+#line 5420 "PhotoMetadata.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -5433,7 +5431,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
_tmp4__length1 = photo_metadata_DATE_TIME_TAGS_length1;
#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 5432 "PhotoMetadata.c"
+#line 5430 "PhotoMetadata.c"
}
}
@@ -5455,7 +5453,7 @@ MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) {
result = _tmp1_;
#line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5454 "PhotoMetadata.c"
+#line 5452 "PhotoMetadata.c"
}
@@ -5469,7 +5467,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
_tmp0_ = date_time;
#line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ != NULL) {
-#line 5468 "PhotoMetadata.c"
+#line 5466 "PhotoMetadata.c"
gchar** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
MetadataDateTime* _tmp2_ = NULL;
@@ -5484,7 +5482,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
_tmp3_ = option;
#line 708 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 5483 "PhotoMetadata.c"
+#line 5481 "PhotoMetadata.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -5494,7 +5492,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
_tmp4__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1;
#line 710 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 5493 "PhotoMetadata.c"
+#line 5491 "PhotoMetadata.c"
}
}
@@ -5516,7 +5514,7 @@ MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) {
result = _tmp1_;
#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5515 "PhotoMetadata.c"
+#line 5513 "PhotoMetadata.c"
}
@@ -5530,7 +5528,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
_tmp0_ = date_time;
#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ != NULL) {
-#line 5529 "PhotoMetadata.c"
+#line 5527 "PhotoMetadata.c"
gchar** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
MetadataDateTime* _tmp2_ = NULL;
@@ -5545,7 +5543,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
_tmp3_ = option;
#line 725 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 5544 "PhotoMetadata.c"
+#line 5542 "PhotoMetadata.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -5555,7 +5553,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
_tmp4__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1;
#line 727 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 5554 "PhotoMetadata.c"
+#line 5552 "PhotoMetadata.c"
}
}
@@ -5576,7 +5574,7 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
_tmp1_ = creation;
#line 732 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp1_ == NULL) {
-#line 5575 "PhotoMetadata.c"
+#line 5573 "PhotoMetadata.c"
MetadataDateTime* _tmp2_ = NULL;
#line 733 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = photo_metadata_get_digitized_date_time (self);
@@ -5584,20 +5582,20 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
_metadata_date_time_unref0 (creation);
#line 733 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
creation = _tmp2_;
-#line 5583 "PhotoMetadata.c"
+#line 5581 "PhotoMetadata.c"
}
#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = creation;
#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5589 "PhotoMetadata.c"
+#line 5587 "PhotoMetadata.c"
}
static gpointer _dimensions_dup0 (gpointer self) {
#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? dimensions_dup (self) : NULL;
-#line 5596 "PhotoMetadata.c"
+#line 5594 "PhotoMetadata.c"
}
@@ -5619,19 +5617,19 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
_tmp1__length1 = photo_metadata_HEIGHT_TAGS_length1;
#line 754 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_assert (_tmp0__length1 == _tmp1__length1, "WIDTH_TAGS.length == HEIGHT_TAGS.length");
-#line 5618 "PhotoMetadata.c"
+#line 5616 "PhotoMetadata.c"
{
gint ctr = 0;
#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
ctr = 0;
-#line 5623 "PhotoMetadata.c"
+#line 5621 "PhotoMetadata.c"
{
gboolean _tmp2_ = FALSE;
#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = TRUE;
#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 5630 "PhotoMetadata.c"
+#line 5628 "PhotoMetadata.c"
gint _tmp4_ = 0;
gchar** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
@@ -5655,13 +5653,13 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
Dimensions* _tmp19_ = NULL;
#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp2_) {
-#line 5654 "PhotoMetadata.c"
+#line 5652 "PhotoMetadata.c"
gint _tmp3_ = 0;
#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = ctr;
#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
ctr = _tmp3_ + 1;
-#line 5660 "PhotoMetadata.c"
+#line 5658 "PhotoMetadata.c"
}
#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = FALSE;
@@ -5675,7 +5673,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
if (!(_tmp4_ < _tmp5__length1)) {
#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 5674 "PhotoMetadata.c"
+#line 5672 "PhotoMetadata.c"
}
#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = photo_metadata_WIDTH_TAGS;
@@ -5693,7 +5691,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
if (!_tmp10_) {
#line 760 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
continue;
-#line 5692 "PhotoMetadata.c"
+#line 5690 "PhotoMetadata.c"
}
#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = photo_metadata_HEIGHT_TAGS;
@@ -5711,7 +5709,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
if (!_tmp15_) {
#line 764 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
continue;
-#line 5710 "PhotoMetadata.c"
+#line 5708 "PhotoMetadata.c"
}
#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = width;
@@ -5725,7 +5723,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
result = _tmp19_;
#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5724 "PhotoMetadata.c"
+#line 5722 "PhotoMetadata.c"
}
}
}
@@ -5733,7 +5731,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
result = NULL;
#line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5732 "PhotoMetadata.c"
+#line 5730 "PhotoMetadata.c"
}
@@ -5745,7 +5743,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
_tmp0_ = dim;
#line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ != NULL) {
-#line 5744 "PhotoMetadata.c"
+#line 5742 "PhotoMetadata.c"
gchar** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
Dimensions* _tmp2_ = NULL;
@@ -5780,7 +5778,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
_tmp8_ = option;
#line 775 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_long (self, _tmp5_, _tmp5__length1, (glong) _tmp7_, _tmp8_);
-#line 5779 "PhotoMetadata.c"
+#line 5777 "PhotoMetadata.c"
} else {
gchar** _tmp9_ = NULL;
gint _tmp9__length1 = 0;
@@ -5798,7 +5796,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
_tmp10__length1 = photo_metadata_HEIGHT_TAGS_length1;
#line 778 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp10_, _tmp10__length1);
-#line 5797 "PhotoMetadata.c"
+#line 5795 "PhotoMetadata.c"
}
}
@@ -5808,21 +5806,21 @@ static gchar* string_strip (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 5821 "PhotoMetadata.c"
+#line 5819 "PhotoMetadata.c"
}
@@ -5830,19 +5828,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 5841 "PhotoMetadata.c"
+#line 5839 "PhotoMetadata.c"
}
@@ -5871,7 +5869,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp1_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp1_) {
-#line 5870 "PhotoMetadata.c"
+#line 5868 "PhotoMetadata.c"
GeeList* _tmp2_ = NULL;
#line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
@@ -5879,7 +5877,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_object_unref0 (_tmp0_);
#line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = _tmp2_;
-#line 5878 "PhotoMetadata.c"
+#line 5876 "PhotoMetadata.c"
} else {
gchar** _tmp3_ = NULL;
gint _tmp3__length1 = 0;
@@ -5894,7 +5892,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_object_unref0 (_tmp0_);
#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = _tmp4_;
-#line 5893 "PhotoMetadata.c"
+#line 5891 "PhotoMetadata.c"
}
#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _g_object_ref0 (_tmp0_);
@@ -5904,7 +5902,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp8_ = titles;
#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp8_ != NULL) {
-#line 5903 "PhotoMetadata.c"
+#line 5901 "PhotoMetadata.c"
GeeList* _tmp9_ = NULL;
gint _tmp10_ = 0;
gint _tmp11_ = 0;
@@ -5916,15 +5914,15 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp11_ = _tmp10_;
#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = _tmp11_ > 0;
-#line 5915 "PhotoMetadata.c"
+#line 5913 "PhotoMetadata.c"
} else {
#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = FALSE;
-#line 5919 "PhotoMetadata.c"
+#line 5917 "PhotoMetadata.c"
}
#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp7_) {
-#line 5923 "PhotoMetadata.c"
+#line 5921 "PhotoMetadata.c"
GeeList* _tmp12_ = NULL;
gpointer _tmp13_ = NULL;
#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5935,13 +5933,13 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_free0 (_tmp6_);
#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = (gchar*) _tmp13_;
-#line 5934 "PhotoMetadata.c"
+#line 5932 "PhotoMetadata.c"
} else {
#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp6_);
#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = NULL;
-#line 5940 "PhotoMetadata.c"
+#line 5938 "PhotoMetadata.c"
}
#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp14_ = g_strdup (_tmp6_);
@@ -5951,7 +5949,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp15_ = title;
#line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp15_ != NULL) {
-#line 5950 "PhotoMetadata.c"
+#line 5948 "PhotoMetadata.c"
const gchar* _tmp16_ = NULL;
gchar* _tmp17_ = NULL;
#line 830 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5962,7 +5960,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_free0 (title);
#line 830 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
title = _tmp17_;
-#line 5961 "PhotoMetadata.c"
+#line 5959 "PhotoMetadata.c"
}
#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp21_ = title;
@@ -5970,7 +5968,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp22_ = is_string_empty (_tmp21_);
#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp22_) {
-#line 5969 "PhotoMetadata.c"
+#line 5967 "PhotoMetadata.c"
const gchar* _tmp23_ = NULL;
gboolean _tmp24_ = FALSE;
#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5979,15 +5977,15 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp24_ = string_contains (_tmp23_, "\n");
#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = !_tmp24_;
-#line 5978 "PhotoMetadata.c"
+#line 5976 "PhotoMetadata.c"
} else {
#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = FALSE;
-#line 5982 "PhotoMetadata.c"
+#line 5980 "PhotoMetadata.c"
}
#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp20_) {
-#line 5986 "PhotoMetadata.c"
+#line 5984 "PhotoMetadata.c"
const gchar* _tmp25_ = NULL;
gboolean _tmp26_ = FALSE;
#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5996,25 +5994,25 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp26_ = string_contains (_tmp25_, "\r");
#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = !_tmp26_;
-#line 5995 "PhotoMetadata.c"
+#line 5993 "PhotoMetadata.c"
} else {
#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = FALSE;
-#line 5999 "PhotoMetadata.c"
+#line 5997 "PhotoMetadata.c"
}
#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp19_) {
-#line 6003 "PhotoMetadata.c"
+#line 6001 "PhotoMetadata.c"
const gchar* _tmp27_ = NULL;
#line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = title;
#line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = _tmp27_;
-#line 6009 "PhotoMetadata.c"
+#line 6007 "PhotoMetadata.c"
} else {
#line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = NULL;
-#line 6013 "PhotoMetadata.c"
+#line 6011 "PhotoMetadata.c"
}
#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp28_ = g_strdup (_tmp18_);
@@ -6030,7 +6028,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_object_unref0 (_tmp0_);
#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6029 "PhotoMetadata.c"
+#line 6027 "PhotoMetadata.c"
}
@@ -6045,19 +6043,19 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
_tmp1_ = is_string_empty (_tmp0_);
#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp1_) {
-#line 6044 "PhotoMetadata.c"
+#line 6042 "PhotoMetadata.c"
gboolean _tmp2_ = FALSE;
#line 839 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
#line 839 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_) {
-#line 6050 "PhotoMetadata.c"
+#line 6048 "PhotoMetadata.c"
const gchar* _tmp3_ = NULL;
#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = title;
#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, PHOTO_METADATA_IPHOTO_TITLE_TAG, _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 6056 "PhotoMetadata.c"
+#line 6054 "PhotoMetadata.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -6073,7 +6071,7 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
_tmp6_ = option;
#line 842 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_string (self, _tmp4_, _tmp4__length1, _tmp5_, _tmp6_);
-#line 6072 "PhotoMetadata.c"
+#line 6070 "PhotoMetadata.c"
}
} else {
gchar** _tmp7_ = NULL;
@@ -6084,7 +6082,7 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
_tmp7__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1;
#line 844 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp7_, _tmp7__length1);
-#line 6083 "PhotoMetadata.c"
+#line 6081 "PhotoMetadata.c"
}
}
@@ -6101,7 +6099,7 @@ static gchar* photo_metadata_real_get_comment (MediaMetadata* base) {
result = _tmp0_;
#line 849 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6100 "PhotoMetadata.c"
+#line 6098 "PhotoMetadata.c"
}
@@ -6116,17 +6114,17 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment) {
_tmp1_ = is_string_empty (_tmp0_);
#line 853 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp1_) {
-#line 6115 "PhotoMetadata.c"
+#line 6113 "PhotoMetadata.c"
const gchar* _tmp2_ = NULL;
#line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = comment;
#line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, "Exif.Photo.UserComment", _tmp2_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF));
-#line 6121 "PhotoMetadata.c"
+#line 6119 "PhotoMetadata.c"
} else {
#line 856 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tag (self, "Exif.Photo.UserComment");
-#line 6125 "PhotoMetadata.c"
+#line 6123 "PhotoMetadata.c"
}
}
@@ -6148,7 +6146,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_tmp0_ = photo_metadata_KEYWORD_TAGS;
#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = photo_metadata_KEYWORD_TAGS_length1;
-#line 6147 "PhotoMetadata.c"
+#line 6145 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -6160,14 +6158,14 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
tag_collection_length1 = _tmp0__length1;
#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 6159 "PhotoMetadata.c"
+#line 6157 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 6166 "PhotoMetadata.c"
+#line 6164 "PhotoMetadata.c"
{
GeeCollection* values = NULL;
const gchar* _tmp2_ = NULL;
@@ -6184,7 +6182,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_tmp5_ = values;
#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp5_ != NULL) {
-#line 6183 "PhotoMetadata.c"
+#line 6181 "PhotoMetadata.c"
GeeCollection* _tmp6_ = NULL;
gint _tmp7_ = 0;
gint _tmp8_ = 0;
@@ -6196,21 +6194,21 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_tmp8_ = _tmp7_;
#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = _tmp8_ > 0;
-#line 6195 "PhotoMetadata.c"
+#line 6193 "PhotoMetadata.c"
} else {
#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = FALSE;
-#line 6199 "PhotoMetadata.c"
+#line 6197 "PhotoMetadata.c"
}
#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
-#line 6203 "PhotoMetadata.c"
+#line 6201 "PhotoMetadata.c"
GeeSet* _tmp9_ = NULL;
#line 877 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = keywords;
#line 877 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp9_ == NULL) {
-#line 6209 "PhotoMetadata.c"
+#line 6207 "PhotoMetadata.c"
GCompareDataFunc _tmp10_ = NULL;
void* _tmp10__target = NULL;
GDestroyNotify _tmp10__target_destroy_notify = NULL;
@@ -6229,7 +6227,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_g_object_unref0 (keywords);
#line 878 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
keywords = _tmp11_;
-#line 6228 "PhotoMetadata.c"
+#line 6226 "PhotoMetadata.c"
}
{
GeeIterator* _current_value_it = NULL;
@@ -6243,7 +6241,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_current_value_it = _tmp13_;
#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 6242 "PhotoMetadata.c"
+#line 6240 "PhotoMetadata.c"
GeeIterator* _tmp14_ = NULL;
gboolean _tmp15_ = FALSE;
gchar* current_value = NULL;
@@ -6261,7 +6259,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
if (!_tmp15_) {
#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6260 "PhotoMetadata.c"
+#line 6258 "PhotoMetadata.c"
}
#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = _current_value_it;
@@ -6283,18 +6281,18 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_g_free0 (_tmp21_);
#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (current_value);
-#line 6282 "PhotoMetadata.c"
+#line 6280 "PhotoMetadata.c"
}
#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_current_value_it);
-#line 6286 "PhotoMetadata.c"
+#line 6284 "PhotoMetadata.c"
}
}
#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 6293 "PhotoMetadata.c"
+#line 6291 "PhotoMetadata.c"
}
}
}
@@ -6302,7 +6300,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_tmp24_ = keywords;
#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp24_ != NULL) {
-#line 6301 "PhotoMetadata.c"
+#line 6299 "PhotoMetadata.c"
GeeSet* _tmp25_ = NULL;
gint _tmp26_ = 0;
gint _tmp27_ = 0;
@@ -6314,25 +6312,25 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_tmp27_ = _tmp26_;
#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp23_ = _tmp27_ > 0;
-#line 6313 "PhotoMetadata.c"
+#line 6311 "PhotoMetadata.c"
} else {
#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp23_ = FALSE;
-#line 6317 "PhotoMetadata.c"
+#line 6315 "PhotoMetadata.c"
}
#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp23_) {
-#line 6321 "PhotoMetadata.c"
+#line 6319 "PhotoMetadata.c"
GeeSet* _tmp28_ = NULL;
#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp28_ = keywords;
#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = _tmp28_;
-#line 6327 "PhotoMetadata.c"
+#line 6325 "PhotoMetadata.c"
} else {
#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = NULL;
-#line 6331 "PhotoMetadata.c"
+#line 6329 "PhotoMetadata.c"
}
#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp29_ = _g_object_ref0 (_tmp22_);
@@ -6350,27 +6348,27 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
compare_func_target_destroy_notify = NULL;
#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6349 "PhotoMetadata.c"
+#line 6347 "PhotoMetadata.c"
}
static gpointer _hierarchical_keyword_field_ref0 (gpointer self) {
#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? hierarchical_keyword_field_ref (self) : NULL;
-#line 6356 "PhotoMetadata.c"
+#line 6354 "PhotoMetadata.c"
}
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 6369 "PhotoMetadata.c"
+#line 6367 "PhotoMetadata.c"
{
GRegex* regex = NULL;
const gchar* _tmp0_ = NULL;
@@ -6383,100 +6381,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6400 "PhotoMetadata.c"
+#line 6398 "PhotoMetadata.c"
goto __catch25_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 6409 "PhotoMetadata.c"
+#line 6407 "PhotoMetadata.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6425 "PhotoMetadata.c"
+#line 6423 "PhotoMetadata.c"
goto __catch25_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 6436 "PhotoMetadata.c"
+#line 6434 "PhotoMetadata.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 6450 "PhotoMetadata.c"
+#line 6448 "PhotoMetadata.c"
}
goto __finally25;
__catch25_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 6464 "PhotoMetadata.c"
+#line 6462 "PhotoMetadata.c"
}
__finally25:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 6475 "PhotoMetadata.c"
+#line 6473 "PhotoMetadata.c"
}
}
@@ -6488,39 +6486,39 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 6499 "PhotoMetadata.c"
+#line 6497 "PhotoMetadata.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 6507 "PhotoMetadata.c"
+#line 6505 "PhotoMetadata.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 6519 "PhotoMetadata.c"
+#line 6517 "PhotoMetadata.c"
}
}
@@ -6538,114 +6536,114 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 6543 "PhotoMetadata.c"
+#line 6541 "PhotoMetadata.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 6549 "PhotoMetadata.c"
+#line 6547 "PhotoMetadata.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 6553 "PhotoMetadata.c"
+#line 6551 "PhotoMetadata.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 6557 "PhotoMetadata.c"
+#line 6555 "PhotoMetadata.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 6569 "PhotoMetadata.c"
+#line 6567 "PhotoMetadata.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 6579 "PhotoMetadata.c"
+#line 6577 "PhotoMetadata.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 6585 "PhotoMetadata.c"
+#line 6583 "PhotoMetadata.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 6599 "PhotoMetadata.c"
+#line 6597 "PhotoMetadata.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 6609 "PhotoMetadata.c"
+#line 6607 "PhotoMetadata.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 6615 "PhotoMetadata.c"
+#line 6613 "PhotoMetadata.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 6624 "PhotoMetadata.c"
+#line 6622 "PhotoMetadata.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 6644 "PhotoMetadata.c"
+#line 6642 "PhotoMetadata.c"
}
@@ -6663,7 +6661,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 6662 "PhotoMetadata.c"
+#line 6660 "PhotoMetadata.c"
{
HierarchicalKeywordField** current_field_collection = NULL;
gint current_field_collection_length1 = 0;
@@ -6675,14 +6673,14 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
current_field_collection_length1 = _tmp0__length1;
#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (current_field_it = 0; current_field_it < _tmp0__length1; current_field_it = current_field_it + 1) {
-#line 6674 "PhotoMetadata.c"
+#line 6672 "PhotoMetadata.c"
HierarchicalKeywordField* _tmp1_ = NULL;
HierarchicalKeywordField* current_field = NULL;
#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_field = _tmp1_;
-#line 6681 "PhotoMetadata.c"
+#line 6679 "PhotoMetadata.c"
{
HierarchicalKeywordField* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
@@ -6694,7 +6692,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
photo_metadata_remove_tag (self, _tmp3_);
#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (current_field);
-#line 6693 "PhotoMetadata.c"
+#line 6691 "PhotoMetadata.c"
}
}
}
@@ -6704,13 +6702,13 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
if (_tmp4_ == NULL) {
#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 6703 "PhotoMetadata.c"
+#line 6701 "PhotoMetadata.c"
}
#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 6709 "PhotoMetadata.c"
+#line 6707 "PhotoMetadata.c"
{
HierarchicalKeywordField** current_field_collection = NULL;
gint current_field_collection_length1 = 0;
@@ -6722,14 +6720,14 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
current_field_collection_length1 = _tmp5__length1;
#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (current_field_it = 0; current_field_it < _tmp5__length1; current_field_it = current_field_it + 1) {
-#line 6721 "PhotoMetadata.c"
+#line 6719 "PhotoMetadata.c"
HierarchicalKeywordField* _tmp6_ = NULL;
HierarchicalKeywordField* current_field = NULL;
#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_field = _tmp6_;
-#line 6728 "PhotoMetadata.c"
+#line 6726 "PhotoMetadata.c"
{
HierarchicalKeywordField* _tmp7_ = NULL;
gboolean _tmp8_ = FALSE;
@@ -6748,13 +6746,13 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_hierarchical_keyword_field_unref0 (current_field);
#line 897 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
continue;
-#line 6747 "PhotoMetadata.c"
+#line 6745 "PhotoMetadata.c"
}
#line 899 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
#line 899 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_SET, GeeSet);
-#line 6753 "PhotoMetadata.c"
+#line 6751 "PhotoMetadata.c"
{
GeeIterator* _current_path_it = NULL;
HierarchicalTagIndex* _tmp10_ = NULL;
@@ -6778,7 +6776,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_current_path_it = _tmp14_;
#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 6777 "PhotoMetadata.c"
+#line 6775 "PhotoMetadata.c"
GeeIterator* _tmp15_ = NULL;
gboolean _tmp16_ = FALSE;
gchar* current_path = NULL;
@@ -6801,7 +6799,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
if (!_tmp16_) {
#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6800 "PhotoMetadata.c"
+#line 6798 "PhotoMetadata.c"
}
#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp17_ = _current_path_it;
@@ -6825,7 +6823,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_tmp24_ = _tmp23_->wants_leading_separator;
#line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp24_) {
-#line 6824 "PhotoMetadata.c"
+#line 6822 "PhotoMetadata.c"
const gchar* _tmp25_ = NULL;
gchar* _tmp26_ = NULL;
#line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6836,7 +6834,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_g_free0 (writeable_path);
#line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
writeable_path = _tmp26_;
-#line 6835 "PhotoMetadata.c"
+#line 6833 "PhotoMetadata.c"
}
#line 907 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = writeable_set;
@@ -6848,11 +6846,11 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_g_free0 (writeable_path);
#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (current_path);
-#line 6847 "PhotoMetadata.c"
+#line 6845 "PhotoMetadata.c"
}
#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_current_path_it);
-#line 6851 "PhotoMetadata.c"
+#line 6849 "PhotoMetadata.c"
}
#line 910 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp29_ = current_field;
@@ -6866,7 +6864,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_g_object_unref0 (writeable_set);
#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (current_field);
-#line 6865 "PhotoMetadata.c"
+#line 6863 "PhotoMetadata.c"
}
}
}
@@ -6896,7 +6894,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
_tmp2_ = keywords;
#line 918 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_ != NULL) {
-#line 6895 "PhotoMetadata.c"
+#line 6893 "PhotoMetadata.c"
GeeSet* _tmp24_ = NULL;
HierarchicalTagIndex* _tmp25_ = NULL;
GeeCollection* _tmp26_ = NULL;
@@ -6913,7 +6911,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
_keyword_it = _tmp4_;
#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 6912 "PhotoMetadata.c"
+#line 6910 "PhotoMetadata.c"
GeeIterator* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
gchar* keyword = NULL;
@@ -6929,7 +6927,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
if (!_tmp6_) {
#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6928 "PhotoMetadata.c"
+#line 6926 "PhotoMetadata.c"
}
#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = _keyword_it;
@@ -6943,7 +6941,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
_tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING);
#line 920 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp10_) {
-#line 6942 "PhotoMetadata.c"
+#line 6940 "PhotoMetadata.c"
GeeCollection* path_components = NULL;
const gchar* _tmp11_ = NULL;
GeeList* _tmp12_ = NULL;
@@ -6953,7 +6951,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
_tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_);
#line 921 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 6952 "PhotoMetadata.c"
+#line 6950 "PhotoMetadata.c"
{
GeeIterator* _component_it = NULL;
GeeCollection* _tmp13_ = NULL;
@@ -6966,7 +6964,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
_component_it = _tmp14_;
#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 6965 "PhotoMetadata.c"
+#line 6963 "PhotoMetadata.c"
GeeIterator* _tmp15_ = NULL;
gboolean _tmp16_ = FALSE;
gchar* component = NULL;
@@ -6983,7 +6981,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
if (!_tmp16_) {
#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6982 "PhotoMetadata.c"
+#line 6980 "PhotoMetadata.c"
}
#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp17_ = _component_it;
@@ -7001,15 +6999,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_);
#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (component);
-#line 7000 "PhotoMetadata.c"
+#line 6998 "PhotoMetadata.c"
}
#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_component_it);
-#line 7004 "PhotoMetadata.c"
+#line 7002 "PhotoMetadata.c"
}
#line 920 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (path_components);
-#line 7008 "PhotoMetadata.c"
+#line 7006 "PhotoMetadata.c"
} else {
GeeSet* _tmp22_ = NULL;
const gchar* _tmp23_ = NULL;
@@ -7019,15 +7017,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
_tmp23_ = keyword;
#line 926 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 7018 "PhotoMetadata.c"
+#line 7016 "PhotoMetadata.c"
}
#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (keyword);
-#line 7022 "PhotoMetadata.c"
+#line 7020 "PhotoMetadata.c"
}
#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_keyword_it);
-#line 7026 "PhotoMetadata.c"
+#line 7024 "PhotoMetadata.c"
}
#line 930 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp24_ = flat_keywords;
@@ -7041,13 +7039,13 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_);
#line 930 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_tmp27_);
-#line 7040 "PhotoMetadata.c"
+#line 7038 "PhotoMetadata.c"
}
#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp28_ = keywords;
#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp28_ != NULL) {
-#line 7046 "PhotoMetadata.c"
+#line 7044 "PhotoMetadata.c"
gchar** _tmp29_ = NULL;
gint _tmp29__length1 = 0;
GeeSet* _tmp30_ = NULL;
@@ -7067,7 +7065,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
_tmp32_ = htag_index;
#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_internal_set_hierarchical_keywords (self, _tmp32_);
-#line 7066 "PhotoMetadata.c"
+#line 7064 "PhotoMetadata.c"
} else {
gchar** _tmp33_ = NULL;
gint _tmp33__length1 = 0;
@@ -7079,13 +7077,13 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
photo_metadata_remove_tags (self, _tmp33_, _tmp33__length1);
#line 938 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_internal_set_hierarchical_keywords (self, NULL);
-#line 7078 "PhotoMetadata.c"
+#line 7076 "PhotoMetadata.c"
}
#line 914 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (flat_keywords);
#line 914 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_tag_index_unref0 (htag_index);
-#line 7084 "PhotoMetadata.c"
+#line 7082 "PhotoMetadata.c"
}
@@ -7099,7 +7097,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7098 "PhotoMetadata.c"
+#line 7096 "PhotoMetadata.c"
{
HierarchicalKeywordField** field_collection = NULL;
gint field_collection_length1 = 0;
@@ -7111,14 +7109,14 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
field_collection_length1 = _tmp0__length1;
#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (field_it = 0; field_it < _tmp0__length1; field_it = field_it + 1) {
-#line 7110 "PhotoMetadata.c"
+#line 7108 "PhotoMetadata.c"
HierarchicalKeywordField* _tmp1_ = NULL;
HierarchicalKeywordField* field = NULL;
#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
field = _tmp1_;
-#line 7117 "PhotoMetadata.c"
+#line 7115 "PhotoMetadata.c"
{
GeeCollection* values = NULL;
HierarchicalKeywordField* _tmp2_ = NULL;
@@ -7138,7 +7136,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
_tmp6_ = values;
#line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp6_ != NULL) {
-#line 7137 "PhotoMetadata.c"
+#line 7135 "PhotoMetadata.c"
GeeCollection* _tmp7_ = NULL;
gint _tmp8_ = 0;
gint _tmp9_ = 0;
@@ -7150,11 +7148,11 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
_tmp9_ = _tmp8_;
#line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _tmp9_ > 0;
-#line 7149 "PhotoMetadata.c"
+#line 7147 "PhotoMetadata.c"
} else {
#line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = FALSE;
-#line 7153 "PhotoMetadata.c"
+#line 7151 "PhotoMetadata.c"
}
#line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp5_) {
@@ -7166,13 +7164,13 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
_hierarchical_keyword_field_unref0 (field);
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7165 "PhotoMetadata.c"
+#line 7163 "PhotoMetadata.c"
}
#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (field);
-#line 7171 "PhotoMetadata.c"
+#line 7169 "PhotoMetadata.c"
}
}
}
@@ -7180,7 +7178,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
result = FALSE;
#line 950 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7179 "PhotoMetadata.c"
+#line 7177 "PhotoMetadata.c"
}
@@ -7205,7 +7203,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_tmp2_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7204 "PhotoMetadata.c"
+#line 7202 "PhotoMetadata.c"
{
HierarchicalKeywordField** field_collection = NULL;
gint field_collection_length1 = 0;
@@ -7217,14 +7215,14 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
field_collection_length1 = _tmp2__length1;
#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (field_it = 0; field_it < _tmp2__length1; field_it = field_it + 1) {
-#line 7216 "PhotoMetadata.c"
+#line 7214 "PhotoMetadata.c"
HierarchicalKeywordField* _tmp3_ = NULL;
HierarchicalKeywordField* field = NULL;
#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
field = _tmp3_;
-#line 7223 "PhotoMetadata.c"
+#line 7221 "PhotoMetadata.c"
{
GeeCollection* values = NULL;
HierarchicalKeywordField* _tmp4_ = NULL;
@@ -7246,7 +7244,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
if (_tmp8_ == NULL) {
#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = TRUE;
-#line 7245 "PhotoMetadata.c"
+#line 7243 "PhotoMetadata.c"
} else {
GeeCollection* _tmp9_ = NULL;
gint _tmp10_ = 0;
@@ -7259,7 +7257,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_tmp11_ = _tmp10_;
#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = _tmp11_ < 1;
-#line 7258 "PhotoMetadata.c"
+#line 7256 "PhotoMetadata.c"
}
#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp7_) {
@@ -7269,7 +7267,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_hierarchical_keyword_field_unref0 (field);
#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
continue;
-#line 7268 "PhotoMetadata.c"
+#line 7266 "PhotoMetadata.c"
}
{
GeeIterator* _current_value_it = NULL;
@@ -7283,7 +7281,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_current_value_it = _tmp13_;
#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 7282 "PhotoMetadata.c"
+#line 7280 "PhotoMetadata.c"
GeeIterator* _tmp14_ = NULL;
gboolean _tmp15_ = FALSE;
gchar* current_value = NULL;
@@ -7303,7 +7301,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
if (!_tmp15_) {
#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 7302 "PhotoMetadata.c"
+#line 7300 "PhotoMetadata.c"
}
#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = _current_value_it;
@@ -7325,7 +7323,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_tmp22_ = canonicalized;
#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp22_ != NULL) {
-#line 7324 "PhotoMetadata.c"
+#line 7322 "PhotoMetadata.c"
GeeSet* _tmp23_ = NULL;
const gchar* _tmp24_ = NULL;
#line 969 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7334,23 +7332,23 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_tmp24_ = canonicalized;
#line 969 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), _tmp24_);
-#line 7333 "PhotoMetadata.c"
+#line 7331 "PhotoMetadata.c"
}
#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (canonicalized);
#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (current_value);
-#line 7339 "PhotoMetadata.c"
+#line 7337 "PhotoMetadata.c"
}
#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_current_value_it);
-#line 7343 "PhotoMetadata.c"
+#line 7341 "PhotoMetadata.c"
}
#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (field);
-#line 7349 "PhotoMetadata.c"
+#line 7347 "PhotoMetadata.c"
}
}
}
@@ -7358,7 +7356,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
result = h_keywords;
#line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7357 "PhotoMetadata.c"
+#line 7355 "PhotoMetadata.c"
}
@@ -7376,7 +7374,7 @@ gboolean photo_metadata_has_orientation (PhotoMetadata* self) {
result = _tmp1_ == GEXIV2_ORIENTATION_UNSPECIFIED;
#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7375 "PhotoMetadata.c"
+#line 7373 "PhotoMetadata.c"
}
@@ -7402,27 +7400,27 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
if (_tmp4_ == GEXIV2_ORIENTATION_UNSPECIFIED) {
#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = TRUE;
-#line 7401 "PhotoMetadata.c"
+#line 7399 "PhotoMetadata.c"
} else {
GExiv2Orientation _tmp5_ = 0;
#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = orientation;
#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp5_ < ORIENTATION_MIN;
-#line 7408 "PhotoMetadata.c"
+#line 7406 "PhotoMetadata.c"
}
#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_) {
#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = TRUE;
-#line 7414 "PhotoMetadata.c"
+#line 7412 "PhotoMetadata.c"
} else {
GExiv2Orientation _tmp6_ = 0;
#line 986 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = orientation;
#line 986 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = _tmp6_ > ORIENTATION_MAX;
-#line 7421 "PhotoMetadata.c"
+#line 7419 "PhotoMetadata.c"
}
#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_) {
@@ -7430,7 +7428,7 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
result = ORIENTATION_TOP_LEFT;
#line 987 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7429 "PhotoMetadata.c"
+#line 7427 "PhotoMetadata.c"
} else {
GExiv2Orientation _tmp7_ = 0;
#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7439,7 +7437,7 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
result = (Orientation) _tmp7_;
#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7438 "PhotoMetadata.c"
+#line 7436 "PhotoMetadata.c"
}
}
@@ -7455,7 +7453,7 @@ void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientatio
_tmp1_ = orientation;
#line 994 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) _tmp1_);
-#line 7454 "PhotoMetadata.c"
+#line 7452 "PhotoMetadata.c"
}
@@ -7501,43 +7499,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar*
if (longitude) {
#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*longitude = _vala_longitude;
-#line 7500 "PhotoMetadata.c"
+#line 7498 "PhotoMetadata.c"
}
#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (long_ref) {
#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*long_ref = _vala_long_ref;
-#line 7506 "PhotoMetadata.c"
+#line 7504 "PhotoMetadata.c"
} else {
#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_long_ref);
-#line 7510 "PhotoMetadata.c"
+#line 7508 "PhotoMetadata.c"
}
#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (latitude) {
#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*latitude = _vala_latitude;
-#line 7516 "PhotoMetadata.c"
+#line 7514 "PhotoMetadata.c"
}
#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (lat_ref) {
#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*lat_ref = _vala_lat_ref;
-#line 7522 "PhotoMetadata.c"
+#line 7520 "PhotoMetadata.c"
} else {
#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_lat_ref);
-#line 7526 "PhotoMetadata.c"
+#line 7524 "PhotoMetadata.c"
}
#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (altitude) {
#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*altitude = _vala_altitude;
-#line 7532 "PhotoMetadata.c"
+#line 7530 "PhotoMetadata.c"
}
#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7536 "PhotoMetadata.c"
+#line 7534 "PhotoMetadata.c"
}
#line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLongitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -7557,43 +7555,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar*
if (longitude) {
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*longitude = _vala_longitude;
-#line 7556 "PhotoMetadata.c"
+#line 7554 "PhotoMetadata.c"
}
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (long_ref) {
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*long_ref = _vala_long_ref;
-#line 7562 "PhotoMetadata.c"
+#line 7560 "PhotoMetadata.c"
} else {
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_long_ref);
-#line 7566 "PhotoMetadata.c"
+#line 7564 "PhotoMetadata.c"
}
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (latitude) {
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*latitude = _vala_latitude;
-#line 7572 "PhotoMetadata.c"
+#line 7570 "PhotoMetadata.c"
}
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (lat_ref) {
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*lat_ref = _vala_lat_ref;
-#line 7578 "PhotoMetadata.c"
+#line 7576 "PhotoMetadata.c"
} else {
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_lat_ref);
-#line 7582 "PhotoMetadata.c"
+#line 7580 "PhotoMetadata.c"
}
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (altitude) {
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*altitude = _vala_altitude;
-#line 7588 "PhotoMetadata.c"
+#line 7586 "PhotoMetadata.c"
}
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7592 "PhotoMetadata.c"
+#line 7590 "PhotoMetadata.c"
}
@@ -7614,11 +7612,11 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp
if (exposure) {
#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*exposure = _vala_exposure;
-#line 7613 "PhotoMetadata.c"
+#line 7611 "PhotoMetadata.c"
}
#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7617 "PhotoMetadata.c"
+#line 7615 "PhotoMetadata.c"
}
@@ -7641,7 +7639,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
result = NULL;
#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7640 "PhotoMetadata.c"
+#line 7638 "PhotoMetadata.c"
}
#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = metadata_rational_is_valid (&exposure_time);
@@ -7651,7 +7649,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
result = NULL;
#line 1022 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7650 "PhotoMetadata.c"
+#line 7648 "PhotoMetadata.c"
}
#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -7659,7 +7657,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
result = _tmp3_;
#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7658 "PhotoMetadata.c"
+#line 7656 "PhotoMetadata.c"
}
@@ -7690,11 +7688,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
if (iso) {
#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*iso = _vala_iso;
-#line 7689 "PhotoMetadata.c"
+#line 7687 "PhotoMetadata.c"
}
#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7693 "PhotoMetadata.c"
+#line 7691 "PhotoMetadata.c"
}
#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = _vala_iso;
@@ -7702,14 +7700,14 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
if (_tmp4_ < ((glong) 6)) {
#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = TRUE;
-#line 7701 "PhotoMetadata.c"
+#line 7699 "PhotoMetadata.c"
} else {
glong _tmp5_ = 0L;
#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _vala_iso;
#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp5_ > ((glong) 409600);
-#line 7708 "PhotoMetadata.c"
+#line 7706 "PhotoMetadata.c"
}
#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_) {
@@ -7719,11 +7717,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
if (iso) {
#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*iso = _vala_iso;
-#line 7718 "PhotoMetadata.c"
+#line 7716 "PhotoMetadata.c"
}
#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7722 "PhotoMetadata.c"
+#line 7720 "PhotoMetadata.c"
}
#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = TRUE;
@@ -7731,11 +7729,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
if (iso) {
#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*iso = _vala_iso;
-#line 7730 "PhotoMetadata.c"
+#line 7728 "PhotoMetadata.c"
}
#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7734 "PhotoMetadata.c"
+#line 7732 "PhotoMetadata.c"
}
@@ -7757,7 +7755,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
result = NULL;
#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7756 "PhotoMetadata.c"
+#line 7754 "PhotoMetadata.c"
}
#line 1046 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ISOSpeedRatings", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -7765,7 +7763,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
result = _tmp2_;
#line 1046 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7764 "PhotoMetadata.c"
+#line 7762 "PhotoMetadata.c"
}
@@ -7786,11 +7784,11 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape
if (aperture) {
#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*aperture = _vala_aperture;
-#line 7785 "PhotoMetadata.c"
+#line 7783 "PhotoMetadata.c"
}
#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7789 "PhotoMetadata.c"
+#line 7787 "PhotoMetadata.c"
}
@@ -7826,7 +7824,7 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
result = NULL;
#line 1056 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7825 "PhotoMetadata.c"
+#line 7823 "PhotoMetadata.c"
}
#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = aperture;
@@ -7848,11 +7846,11 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
if (_tmp8_) {
#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = "<i>f</i>/";
-#line 7847 "PhotoMetadata.c"
+#line 7845 "PhotoMetadata.c"
} else {
#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = "f/";
-#line 7851 "PhotoMetadata.c"
+#line 7849 "PhotoMetadata.c"
}
#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = aperture_value;
@@ -7860,11 +7858,11 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
if (fmod (_tmp10_, 1) == ((gdouble) 0)) {
#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = "%.0f";
-#line 7859 "PhotoMetadata.c"
+#line 7857 "PhotoMetadata.c"
} else {
#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = "%.1f";
-#line 7863 "PhotoMetadata.c"
+#line 7861 "PhotoMetadata.c"
}
#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = aperture_value;
@@ -7882,7 +7880,7 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
result = _tmp15_;
#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7881 "PhotoMetadata.c"
+#line 7879 "PhotoMetadata.c"
}
@@ -7897,7 +7895,7 @@ gchar* photo_metadata_get_camera_make (PhotoMetadata* self) {
result = _tmp0_;
#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7896 "PhotoMetadata.c"
+#line 7894 "PhotoMetadata.c"
}
@@ -7912,7 +7910,7 @@ gchar* photo_metadata_get_camera_model (PhotoMetadata* self) {
result = _tmp0_;
#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7911 "PhotoMetadata.c"
+#line 7909 "PhotoMetadata.c"
}
@@ -7933,11 +7931,11 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) {
if (flash) {
#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*flash = _vala_flash;
-#line 7932 "PhotoMetadata.c"
+#line 7930 "PhotoMetadata.c"
}
#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7936 "PhotoMetadata.c"
+#line 7934 "PhotoMetadata.c"
}
@@ -7952,7 +7950,7 @@ gchar* photo_metadata_get_flash_string (PhotoMetadata* self) {
result = _tmp0_;
#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7951 "PhotoMetadata.c"
+#line 7949 "PhotoMetadata.c"
}
@@ -7973,11 +7971,11 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational*
if (focal_length) {
#line 1084 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*focal_length = _vala_focal_length;
-#line 7972 "PhotoMetadata.c"
+#line 7970 "PhotoMetadata.c"
}
#line 1084 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7976 "PhotoMetadata.c"
+#line 7974 "PhotoMetadata.c"
}
@@ -7992,7 +7990,7 @@ gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) {
result = _tmp0_;
#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7991 "PhotoMetadata.c"
+#line 7989 "PhotoMetadata.c"
}
@@ -8013,7 +8011,7 @@ gchar* photo_metadata_get_artist (PhotoMetadata* self) {
result = _tmp1_;
#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8012 "PhotoMetadata.c"
+#line 8010 "PhotoMetadata.c"
}
@@ -8028,7 +8026,7 @@ gchar* photo_metadata_get_copyright (PhotoMetadata* self) {
result = _tmp0_;
#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8027 "PhotoMetadata.c"
+#line 8025 "PhotoMetadata.c"
}
@@ -8043,7 +8041,7 @@ gchar* photo_metadata_get_software (PhotoMetadata* self) {
result = _tmp0_;
#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8042 "PhotoMetadata.c"
+#line 8040 "PhotoMetadata.c"
}
@@ -8075,7 +8073,7 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co
_tmp4_ = photo_metadata_has_iptc (self);
#line 1112 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
-#line 8074 "PhotoMetadata.c"
+#line 8072 "PhotoMetadata.c"
const gchar* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8086,7 +8084,7 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co
_tmp6_ = version;
#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", _tmp6_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 8085 "PhotoMetadata.c"
+#line 8083 "PhotoMetadata.c"
}
}
@@ -8100,7 +8098,7 @@ void photo_metadata_remove_software (PhotoMetadata* self) {
photo_metadata_remove_tag (self, "Iptc.Application2.Program");
#line 1121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tag (self, "Iptc.Application2.ProgramVersion");
-#line 8099 "PhotoMetadata.c"
+#line 8097 "PhotoMetadata.c"
}
@@ -8115,7 +8113,7 @@ gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) {
result = _tmp0_;
#line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8114 "PhotoMetadata.c"
+#line 8112 "PhotoMetadata.c"
}
@@ -8146,7 +8144,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_tmp2_ = rating_string;
#line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_ != NULL) {
-#line 8145 "PhotoMetadata.c"
+#line 8143 "PhotoMetadata.c"
const gchar* _tmp3_ = NULL;
gint _tmp4_ = 0;
Rating _tmp5_ = 0;
@@ -8162,7 +8160,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_g_free0 (rating_string);
#line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8161 "PhotoMetadata.c"
+#line 8159 "PhotoMetadata.c"
}
#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -8180,7 +8178,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_g_free0 (rating_string);
#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8179 "PhotoMetadata.c"
+#line 8177 "PhotoMetadata.c"
}
#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = rating_string;
@@ -8188,32 +8186,32 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_tmp9_ = atoi (_tmp8_);
#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
int_percent_rating = _tmp9_;
-#line 8187 "PhotoMetadata.c"
+#line 8185 "PhotoMetadata.c"
{
gint i = 0;
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
i = 5;
-#line 8192 "PhotoMetadata.c"
+#line 8190 "PhotoMetadata.c"
{
gboolean _tmp10_ = FALSE;
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = TRUE;
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 8199 "PhotoMetadata.c"
+#line 8197 "PhotoMetadata.c"
gint _tmp12_ = 0;
gint _tmp13_ = 0;
gint _tmp14_ = 0;
gint _tmp15_ = 0;
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp10_) {
-#line 8206 "PhotoMetadata.c"
+#line 8204 "PhotoMetadata.c"
gint _tmp11_ = 0;
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = i;
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
i = _tmp11_ - 1;
-#line 8212 "PhotoMetadata.c"
+#line 8210 "PhotoMetadata.c"
}
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = FALSE;
@@ -8223,7 +8221,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
if (!(_tmp12_ >= 0)) {
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 8222 "PhotoMetadata.c"
+#line 8220 "PhotoMetadata.c"
}
#line 1147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = int_percent_rating;
@@ -8233,7 +8231,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_tmp15_ = RESOURCES_rating_thresholds[_tmp14_];
#line 1147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp13_ >= _tmp15_) {
-#line 8232 "PhotoMetadata.c"
+#line 8230 "PhotoMetadata.c"
gint _tmp16_ = 0;
Rating _tmp17_ = 0;
#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8246,7 +8244,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_g_free0 (rating_string);
#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8245 "PhotoMetadata.c"
+#line 8243 "PhotoMetadata.c"
}
}
}
@@ -8259,7 +8257,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_g_free0 (rating_string);
#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8258 "PhotoMetadata.c"
+#line 8256 "PhotoMetadata.c"
}
@@ -8306,7 +8304,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
_tmp8_ = int_rating;
#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (0 <= _tmp8_) {
-#line 8305 "PhotoMetadata.c"
+#line 8303 "PhotoMetadata.c"
gint _tmp9_ = 0;
gint _tmp10_ = 0;
gchar* _tmp11_ = NULL;
@@ -8323,7 +8321,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp12_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp12_);
-#line 8322 "PhotoMetadata.c"
+#line 8320 "PhotoMetadata.c"
} else {
gint _tmp13_ = 0;
gchar* _tmp14_ = NULL;
@@ -8338,7 +8336,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp15_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp15_);
-#line 8337 "PhotoMetadata.c"
+#line 8335 "PhotoMetadata.c"
}
}
@@ -8346,7 +8344,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
static gpointer _media_metadata_ref0 (gpointer self) {
#line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? media_metadata_ref (self) : NULL;
-#line 8345 "PhotoMetadata.c"
+#line 8343 "PhotoMetadata.c"
}
@@ -8372,7 +8370,7 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_
#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- g_return_val_if_fail (props != NULL, NULL);
+ g_return_val_if_fail (GEXIV2_IS_PREVIEW_PROPERTIES (props), NULL);
#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = name;
#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8413,21 +8411,21 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_
self->number = _tmp14_;
#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self;
-#line 8412 "PhotoMetadata.c"
+#line 8410 "PhotoMetadata.c"
}
static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) {
#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return photo_metadata_internal_photo_preview_construct (PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, owner, name, number, props);
-#line 8419 "PhotoMetadata.c"
+#line 8417 "PhotoMetadata.c"
}
static guint8* _vala_array_dup6 (guint8* self, int length) {
#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_memdup (self, length * sizeof (guint8));
-#line 8426 "PhotoMetadata.c"
+#line 8424 "PhotoMetadata.c"
}
@@ -8452,7 +8450,7 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
GExiv2PreviewProperties* _tmp12_ = NULL;
GExiv2PreviewImage* _tmp13_ = NULL;
GExiv2PreviewImage* _tmp14_ = NULL;
- gint _tmp15_ = 0;
+ guint32 _tmp15_;
guint8* _tmp16_ = NULL;
guint8* _tmp17_ = NULL;
gint _tmp17__length1 = 0;
@@ -8480,7 +8478,7 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
_tmp5__length1 = props_length1;
#line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp5_ != NULL) {
-#line 8479 "PhotoMetadata.c"
+#line 8477 "PhotoMetadata.c"
GExiv2PreviewProperties** _tmp6_ = NULL;
gint _tmp6__length1 = 0;
guint _tmp7_ = 0U;
@@ -8492,11 +8490,11 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
_tmp7_ = self->number;
#line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = ((guint) _tmp6__length1) > _tmp7_;
-#line 8491 "PhotoMetadata.c"
+#line 8489 "PhotoMetadata.c"
} else {
#line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = FALSE;
-#line 8495 "PhotoMetadata.c"
+#line 8493 "PhotoMetadata.c"
}
#line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_assert (_tmp4_, "props != null && props.length > number");
@@ -8527,7 +8525,7 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18__length1 = _tmp17__length1;
#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _gexiv2_preview_image_free0 (_tmp14_);
+ _g_object_unref0 (_tmp14_);
#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = _tmp18_;
#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8536,13 +8534,13 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
if (result_length1) {
#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*result_length1 = _tmp19__length1;
-#line 8535 "PhotoMetadata.c"
+#line 8533 "PhotoMetadata.c"
}
#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp19_;
#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8541 "PhotoMetadata.c"
+#line 8539 "PhotoMetadata.c"
}
@@ -8553,7 +8551,7 @@ static void photo_metadata_internal_photo_preview_class_init (PhotoMetadataInter
((PhotoPreviewClass *) klass)->finalize = photo_metadata_internal_photo_preview_finalize;
#line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
((PhotoPreviewClass *) klass)->flatten = photo_metadata_internal_photo_preview_real_flatten;
-#line 8552 "PhotoMetadata.c"
+#line 8550 "PhotoMetadata.c"
}
@@ -8569,7 +8567,7 @@ static void photo_metadata_internal_photo_preview_finalize (PhotoPreview* obj) {
_media_metadata_unref0 (self->owner);
#line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
PHOTO_PREVIEW_CLASS (photo_metadata_internal_photo_preview_parent_class)->finalize (obj);
-#line 8568 "PhotoMetadata.c"
+#line 8566 "PhotoMetadata.c"
}
@@ -8840,7 +8838,7 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) {
photo_metadata_RATING_TAGS = _tmp43_;
#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_RATING_TAGS_length1 = 4;
-#line 8839 "PhotoMetadata.c"
+#line 8837 "PhotoMetadata.c"
}
@@ -8859,7 +8857,7 @@ static void photo_metadata_instance_init (PhotoMetadata * self) {
_tmp1_ = g_strdup ("<uninitialized>");
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->source_name = _tmp1_;
-#line 8858 "PhotoMetadata.c"
+#line 8856 "PhotoMetadata.c"
}
@@ -8868,14 +8866,14 @@ static void photo_metadata_finalize (MediaMetadata* obj) {
#line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_METADATA, PhotoMetadata);
#line 135 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _gexiv2_metadata_free0 (self->priv->exiv2);
+ _g_object_unref0 (self->priv->exiv2);
#line 136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_exif_data_unref0 (self->priv->exif);
#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (self->priv->source_name);
#line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
MEDIA_METADATA_CLASS (photo_metadata_parent_class)->finalize (obj);
-#line 8874 "PhotoMetadata.c"
+#line 8872 "PhotoMetadata.c"
}
diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
index a99e0c1..a410499 100644
--- a/src/photos/PhotoMetadata.vala
+++ b/src/photos/PhotoMetadata.vala
@@ -103,7 +103,7 @@ public class PhotoMetadata : MediaMetadata {
AT_LEAST_DEFAULT_DOMAIN
}
- private const PrepareInputTextOptions PREPARE_STRING_OPTIONS =
+ public const PrepareInputTextOptions PREPARE_STRING_OPTIONS =
PrepareInputTextOptions.INVALID_IS_NULL
| PrepareInputTextOptions.EMPTY_IS_NULL
| PrepareInputTextOptions.STRIP
diff --git a/src/photos/Photos.c b/src/photos/Photos.c
index 434f905..2395165 100644
--- a/src/photos/Photos.c
+++ b/src/photos/Photos.c
@@ -1,4 +1,4 @@
-/* Photos.c generated by valac 0.32.1, the Vala compiler
+/* Photos.c generated by valac 0.34.1, the Vala compiler
* generated from Photos.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PngSupport.c b/src/photos/PngSupport.c
index 98d4cd2..11ca7ab 100644
--- a/src/photos/PngSupport.c
+++ b/src/photos/PngSupport.c
@@ -1,4 +1,4 @@
-/* PngSupport.c generated by valac 0.32.1, the Vala compiler
+/* PngSupport.c generated by valac 0.34.1, the Vala compiler
* generated from PngSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1020,7 +1020,7 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
#line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp4__length1 = file_lead_sequence_length1;
#line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_INPUT_STREAM, GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
+ g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
#line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index e06b1d5..14d1fbe 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -1,4 +1,4 @@
-/* RawSupport.c generated by valac 0.32.1, the Vala compiler
+/* RawSupport.c generated by valac 0.34.1, the Vala compiler
* generated from RawSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c
index 2e1282e..9cc1094 100644
--- a/src/photos/TiffSupport.c
+++ b/src/photos/TiffSupport.c
@@ -1,4 +1,4 @@
-/* TiffSupport.c generated by valac 0.32.1, the Vala compiler
+/* TiffSupport.c generated by valac 0.34.1, the Vala compiler
* generated from TiffSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1601,7 +1601,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
#line 1602 "TiffSupport.c"
}
#line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- _tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_INPUT_STREAM, GInputStream));
+ _tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
#line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
dins = _tmp3_;
#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
diff --git a/src/plugins/DataImportsInterfaces.c b/src/plugins/DataImportsInterfaces.c
index 96920a9..89fcadd 100644
--- a/src/plugins/DataImportsInterfaces.c
+++ b/src/plugins/DataImportsInterfaces.c
@@ -1,4 +1,4 @@
-/* DataImportsInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* DataImportsInterfaces.c generated by valac 0.34.1, the Vala compiler
* generated from DataImportsInterfaces.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c
index e09267a..fdc843c 100644
--- a/src/plugins/ManifestWidget.c
+++ b/src/plugins/ManifestWidget.c
@@ -1,4 +1,4 @@
-/* ManifestWidget.c generated by valac 0.32.1, the Vala compiler
+/* ManifestWidget.c generated by valac 0.34.1, the Vala compiler
* generated from ManifestWidget.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -245,19 +245,19 @@ static gchar* string_strip (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 263 "ManifestWidget.c"
}
diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c
index 0134c1f..4928cf4 100644
--- a/src/plugins/Plugins.c
+++ b/src/plugins/Plugins.c
@@ -1,4 +1,4 @@
-/* Plugins.c generated by valac 0.32.1, the Vala compiler
+/* Plugins.c generated by valac 0.34.1, the Vala compiler
* generated from Plugins.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/PublishingInterfaces.c b/src/plugins/PublishingInterfaces.c
index e2e22cb..468329a 100644
--- a/src/plugins/PublishingInterfaces.c
+++ b/src/plugins/PublishingInterfaces.c
@@ -1,4 +1,4 @@
-/* PublishingInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* PublishingInterfaces.c generated by valac 0.34.1, the Vala compiler
* generated from PublishingInterfaces.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/SpitInterfaces.c b/src/plugins/SpitInterfaces.c
index 9357a68..0884982 100644
--- a/src/plugins/SpitInterfaces.c
+++ b/src/plugins/SpitInterfaces.c
@@ -1,4 +1,4 @@
-/* SpitInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* SpitInterfaces.c generated by valac 0.34.1, the Vala compiler
* generated from SpitInterfaces.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/StandardHostInterface.c b/src/plugins/StandardHostInterface.c
index 3465427..c6480fa 100644
--- a/src/plugins/StandardHostInterface.c
+++ b/src/plugins/StandardHostInterface.c
@@ -1,4 +1,4 @@
-/* StandardHostInterface.c generated by valac 0.32.1, the Vala compiler
+/* StandardHostInterface.c generated by valac 0.34.1, the Vala compiler
* generated from StandardHostInterface.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/plugins/TransitionsInterfaces.c b/src/plugins/TransitionsInterfaces.c
index aedb555..9b1b5ac 100644
--- a/src/plugins/TransitionsInterfaces.c
+++ b/src/plugins/TransitionsInterfaces.c
@@ -1,4 +1,4 @@
-/* TransitionsInterfaces.c generated by valac 0.32.1, the Vala compiler
+/* TransitionsInterfaces.c generated by valac 0.34.1, the Vala compiler
* generated from TransitionsInterfaces.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index 29cdd0a..bce21cd 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -1,4 +1,4 @@
-/* APIGlue.c generated by valac 0.32.1, the Vala compiler
+/* APIGlue.c generated by valac 0.34.1, the Vala compiler
* generated from APIGlue.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/publishing/Publishing.c b/src/publishing/Publishing.c
index fc14775..99b7a82 100644
--- a/src/publishing/Publishing.c
+++ b/src/publishing/Publishing.c
@@ -1,4 +1,4 @@
-/* Publishing.c generated by valac 0.32.1, the Vala compiler
+/* Publishing.c generated by valac 0.34.1, the Vala compiler
* generated from Publishing.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index 45a7681..dd04855 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -1,4 +1,4 @@
-/* PublishingPluginHost.c generated by valac 0.32.1, the Vala compiler
+/* PublishingPluginHost.c generated by valac 0.34.1, the Vala compiler
* generated from PublishingPluginHost.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c
index 9dcf2e0..53471cd 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -1,4 +1,4 @@
-/* PublishingUI.c generated by valac 0.32.1, the Vala compiler
+/* PublishingUI.c generated by valac 0.34.1, the Vala compiler
* generated from PublishingUI.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/searches/Branch.c b/src/searches/Branch.c
index 81618ba..2e6e87f 100644
--- a/src/searches/Branch.c
+++ b/src/searches/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.1, the Vala compiler
* generated from Branch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c
index 4731710..cff4982 100644
--- a/src/searches/SavedSearchDialog.c
+++ b/src/searches/SavedSearchDialog.c
@@ -1,4 +1,4 @@
-/* SavedSearchDialog.c generated by valac 0.32.1, the Vala compiler
+/* SavedSearchDialog.c generated by valac 0.34.1, the Vala compiler
* generated from SavedSearchDialog.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1777,19 +1777,19 @@ static gchar* string_chomp (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1191 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strchomp (_tmp1_);
-#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1795 "SavedSearchDialog.c"
}
diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c
index a9aa029..b55e498 100644
--- a/src/searches/SavedSearchPage.c
+++ b/src/searches/SavedSearchPage.c
@@ -1,4 +1,4 @@
-/* SavedSearchPage.c generated by valac 0.32.1, the Vala compiler
+/* SavedSearchPage.c generated by valac 0.34.1, the Vala compiler
* generated from SavedSearchPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index b182916..0490d60 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -1,4 +1,4 @@
-/* SearchBoolean.c generated by valac 0.32.1, the Vala compiler
+/* SearchBoolean.c generated by valac 0.34.1, the Vala compiler
* generated from SearchBoolean.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2305,17 +2305,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2320 "SearchBoolean.c"
}
diff --git a/src/searches/Searches.c b/src/searches/Searches.c
index 1ab6b90..caefb86 100644
--- a/src/searches/Searches.c
+++ b/src/searches/Searches.c
@@ -1,4 +1,4 @@
-/* Searches.c generated by valac 0.32.1, the Vala compiler
+/* Searches.c generated by valac 0.34.1, the Vala compiler
* generated from Searches.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/Branch.c b/src/sidebar/Branch.c
index 10f7a72..cb9ad14 100644
--- a/src/sidebar/Branch.c
+++ b/src/sidebar/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.1, the Vala compiler
* generated from Branch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/Entry.c b/src/sidebar/Entry.c
index caa621c..ae0aeb0 100644
--- a/src/sidebar/Entry.c
+++ b/src/sidebar/Entry.c
@@ -1,4 +1,4 @@
-/* Entry.c generated by valac 0.32.1, the Vala compiler
+/* Entry.c generated by valac 0.34.1, the Vala compiler
* generated from Entry.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/Sidebar.c b/src/sidebar/Sidebar.c
index 888a70c..328d6a9 100644
--- a/src/sidebar/Sidebar.c
+++ b/src/sidebar/Sidebar.c
@@ -1,4 +1,4 @@
-/* Sidebar.c generated by valac 0.32.1, the Vala compiler
+/* Sidebar.c generated by valac 0.34.1, the Vala compiler
* generated from Sidebar.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/Tree.c b/src/sidebar/Tree.c
index d784043..c18f988 100644
--- a/src/sidebar/Tree.c
+++ b/src/sidebar/Tree.c
@@ -1,4 +1,4 @@
-/* Tree.c generated by valac 0.32.1, the Vala compiler
+/* Tree.c generated by valac 0.34.1, the Vala compiler
* generated from Tree.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/sidebar/common.c b/src/sidebar/common.c
index 1ef4450..0a5eeb0 100644
--- a/src/sidebar/common.c
+++ b/src/sidebar/common.c
@@ -1,4 +1,4 @@
-/* common.c generated by valac 0.32.1, the Vala compiler
+/* common.c generated by valac 0.34.1, the Vala compiler
* generated from common.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/slideshow/Slideshow.c b/src/slideshow/Slideshow.c
index 1731cfa..0a92fb4 100644
--- a/src/slideshow/Slideshow.c
+++ b/src/slideshow/Slideshow.c
@@ -1,4 +1,4 @@
-/* Slideshow.c generated by valac 0.32.1, the Vala compiler
+/* Slideshow.c generated by valac 0.34.1, the Vala compiler
* generated from Slideshow.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/slideshow/TransitionEffects.c b/src/slideshow/TransitionEffects.c
index 292187e..aa47a29 100644
--- a/src/slideshow/TransitionEffects.c
+++ b/src/slideshow/TransitionEffects.c
@@ -1,4 +1,4 @@
-/* TransitionEffects.c generated by valac 0.32.1, the Vala compiler
+/* TransitionEffects.c generated by valac 0.34.1, the Vala compiler
* generated from TransitionEffects.vala, do not modify */
/* Copyright 2010 Maxim Kartashev
diff --git a/src/tags/Branch.c b/src/tags/Branch.c
index adcbabd..20ba882 100644
--- a/src/tags/Branch.c
+++ b/src/tags/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.32.1, the Vala compiler
+/* Branch.c generated by valac 0.34.1, the Vala compiler
* generated from Branch.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2416,11 +2416,11 @@ static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEnt
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
#line 2426 "Branch.c"
{
@@ -2435,73 +2435,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 2457 "Branch.c"
goto __catch52_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 2466 "Branch.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 2482 "Branch.c"
goto __catch52_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 2493 "Branch.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2507 "Branch.c"
}
@@ -2509,24 +2509,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
__catch52_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
#line 2521 "Branch.c"
}
__finally52:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 2532 "Branch.c"
}
@@ -3041,39 +3041,39 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
gint _tmp3__length1 = 0;
guint8* _tmp4_ = NULL;
gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res_length1 = -1;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (result_length1) {
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result_length1 = _tmp4__length1;
#line 3073 "Branch.c"
}
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3079 "Branch.c"
}
diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c
index d77738d..fc0a473 100644
--- a/src/tags/HierarchicalTagIndex.c
+++ b/src/tags/HierarchicalTagIndex.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagIndex.c generated by valac 0.32.1, the Vala compiler
+/* HierarchicalTagIndex.c generated by valac 0.34.1, the Vala compiler
* generated from HierarchicalTagIndex.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c
index 827d497..1f9b2de 100644
--- a/src/tags/HierarchicalTagUtilities.c
+++ b/src/tags/HierarchicalTagUtilities.c
@@ -1,4 +1,4 @@
-/* HierarchicalTagUtilities.c generated by valac 0.32.1, the Vala compiler
+/* HierarchicalTagUtilities.c generated by valac 0.34.1, the Vala compiler
* generated from HierarchicalTagUtilities.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -263,37 +263,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 279 "HierarchicalTagUtilities.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 287 "HierarchicalTagUtilities.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 299 "HierarchicalTagUtilities.c"
}
@@ -313,112 +313,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 323 "HierarchicalTagUtilities.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 329 "HierarchicalTagUtilities.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 333 "HierarchicalTagUtilities.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 337 "HierarchicalTagUtilities.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 349 "HierarchicalTagUtilities.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 359 "HierarchicalTagUtilities.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 365 "HierarchicalTagUtilities.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 379 "HierarchicalTagUtilities.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 389 "HierarchicalTagUtilities.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 395 "HierarchicalTagUtilities.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 404 "HierarchicalTagUtilities.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 424 "HierarchicalTagUtilities.c"
}
@@ -756,72 +756,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
gboolean _tmp2_ = FALSE;
gchar** _tmp3_ = NULL;
gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
separator = "";
#line 766 "HierarchicalTagUtilities.c"
}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = TRUE;
#line 776 "HierarchicalTagUtilities.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp4__length1 > 0;
#line 786 "HierarchicalTagUtilities.c"
}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = TRUE;
#line 792 "HierarchicalTagUtilities.c"
} else {
gboolean _tmp5_ = FALSE;
gchar** _tmp6_ = NULL;
gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp6__length1 == -1) {
#line 803 "HierarchicalTagUtilities.c"
gchar** _tmp7_ = NULL;
gint _tmp7__length1 = 0;
const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_ != NULL;
#line 815 "HierarchicalTagUtilities.c"
} else {
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = FALSE;
#line 819 "HierarchicalTagUtilities.c"
}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp5_;
#line 823 "HierarchicalTagUtilities.c"
}
-#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_) {
#line 827 "HierarchicalTagUtilities.c"
gint i = 0;
@@ -844,16 +844,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
const gchar* _tmp44_ = NULL;
void* _tmp45_ = NULL;
const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = (gsize) 1;
#line 850 "HierarchicalTagUtilities.c"
{
gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
i = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
while (TRUE) {
#line 859 "HierarchicalTagUtilities.c"
gboolean _tmp11_ = FALSE;
@@ -866,97 +866,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
gint _tmp23_ = 0;
const gchar* _tmp24_ = NULL;
gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (!_tmp9_) {
#line 872 "HierarchicalTagUtilities.c"
gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
i = _tmp10_ + 1;
#line 878 "HierarchicalTagUtilities.c"
}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp13__length1 != -1) {
#line 888 "HierarchicalTagUtilities.c"
gint _tmp14_ = 0;
gchar** _tmp15_ = NULL;
gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ < _tmp15__length1;
#line 900 "HierarchicalTagUtilities.c"
} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
#line 904 "HierarchicalTagUtilities.c"
}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = TRUE;
#line 910 "HierarchicalTagUtilities.c"
} else {
gboolean _tmp16_ = FALSE;
gchar** _tmp17_ = NULL;
gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp17__length1 == -1) {
#line 921 "HierarchicalTagUtilities.c"
gchar** _tmp18_ = NULL;
gint _tmp18__length1 = 0;
gint _tmp19_ = 0;
const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = _tmp20_ != NULL;
#line 936 "HierarchicalTagUtilities.c"
} else {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = FALSE;
#line 940 "HierarchicalTagUtilities.c"
}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = _tmp16_;
#line 944 "HierarchicalTagUtilities.c"
}
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
break;
#line 950 "HierarchicalTagUtilities.c"
}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp24_ != NULL) {
#line 962 "HierarchicalTagUtilities.c"
gchar** _tmp25_ = NULL;
@@ -965,91 +965,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
const gchar* _tmp27_ = NULL;
gint _tmp28_ = 0;
gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = _tmp29_;
#line 983 "HierarchicalTagUtilities.c"
} else {
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = 0;
#line 987 "HierarchicalTagUtilities.c"
}
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp30_ + _tmp21_;
#line 993 "HierarchicalTagUtilities.c"
}
}
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp31_ == 0) {
#line 1000 "HierarchicalTagUtilities.c"
gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp32_;
-#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1008 "HierarchicalTagUtilities.c"
}
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res = _tmp41_;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
ptr = _tmp45_;
#line 1046 "HierarchicalTagUtilities.c"
{
gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
i = 1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
while (TRUE) {
#line 1055 "HierarchicalTagUtilities.c"
gint _tmp48_ = 0;
@@ -1065,94 +1065,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
const gchar* _tmp56_ = NULL;
void* _tmp60_ = NULL;
void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (!_tmp46_) {
#line 1071 "HierarchicalTagUtilities.c"
gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
i = _tmp47_ + 1;
#line 1077 "HierarchicalTagUtilities.c"
}
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
break;
#line 1091 "HierarchicalTagUtilities.c"
}
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp56_ != NULL) {
#line 1111 "HierarchicalTagUtilities.c"
gchar** _tmp57_ = NULL;
gint _tmp57__length1 = 0;
gint _tmp58_ = 0;
const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp53_ = (const gchar*) _tmp59_;
#line 1126 "HierarchicalTagUtilities.c"
} else {
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp53_ = "";
#line 1130 "HierarchicalTagUtilities.c"
}
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
ptr = _tmp61_;
#line 1138 "HierarchicalTagUtilities.c"
}
}
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res = NULL;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1149 "HierarchicalTagUtilities.c"
} else {
gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp63_;
-#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1158 "HierarchicalTagUtilities.c"
}
@@ -1273,11 +1273,11 @@ gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path) {
static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
gchar* result = NULL;
GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
#line 1283 "HierarchicalTagUtilities.c"
{
@@ -1292,73 +1292,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 1314 "HierarchicalTagUtilities.c"
goto __catch53_g_regex_error;
}
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 1323 "HierarchicalTagUtilities.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
#line 1339 "HierarchicalTagUtilities.c"
goto __catch53_g_regex_error;
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 1350 "HierarchicalTagUtilities.c"
}
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp9_;
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1364 "HierarchicalTagUtilities.c"
}
@@ -1366,24 +1366,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
__catch53_g_regex_error:
{
GError* e = NULL;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
e = _inner_error_;
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
#line 1378 "HierarchicalTagUtilities.c"
}
__finally53:
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
#line 1389 "HierarchicalTagUtilities.c"
}
@@ -1394,15 +1394,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1408 "HierarchicalTagUtilities.c"
}
diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c
index c85ae23..c2cb74f 100644
--- a/src/tags/TagPage.c
+++ b/src/tags/TagPage.c
@@ -1,4 +1,4 @@
-/* TagPage.c generated by valac 0.32.1, the Vala compiler
+/* TagPage.c generated by valac 0.34.1, the Vala compiler
* generated from TagPage.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/tags/Tags.c b/src/tags/Tags.c
index 0f14960..1cafea2 100644
--- a/src/tags/Tags.c
+++ b/src/tags/Tags.c
@@ -1,4 +1,4 @@
-/* Tags.c generated by valac 0.32.1, the Vala compiler
+/* Tags.c generated by valac 0.34.1, the Vala compiler
* generated from Tags.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/BackgroundJob.c b/src/threads/BackgroundJob.c
index 94c8745..f497e25 100644
--- a/src/threads/BackgroundJob.c
+++ b/src/threads/BackgroundJob.c
@@ -1,4 +1,4 @@
-/* BackgroundJob.c generated by valac 0.32.1, the Vala compiler
+/* BackgroundJob.c generated by valac 0.34.1, the Vala compiler
* generated from BackgroundJob.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/Semaphore.c b/src/threads/Semaphore.c
index 9874b65..09c49b8 100644
--- a/src/threads/Semaphore.c
+++ b/src/threads/Semaphore.c
@@ -1,4 +1,4 @@
-/* Semaphore.c generated by valac 0.32.1, the Vala compiler
+/* Semaphore.c generated by valac 0.34.1, the Vala compiler
* generated from Semaphore.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/Threads.c b/src/threads/Threads.c
index d87457f..6a4a697 100644
--- a/src/threads/Threads.c
+++ b/src/threads/Threads.c
@@ -1,4 +1,4 @@
-/* Threads.c generated by valac 0.32.1, the Vala compiler
+/* Threads.c generated by valac 0.34.1, the Vala compiler
* generated from Threads.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/threads/Workers.c b/src/threads/Workers.c
index 92d5e97..da62724 100644
--- a/src/threads/Workers.c
+++ b/src/threads/Workers.c
@@ -1,4 +1,4 @@
-/* Workers.c generated by valac 0.32.1, the Vala compiler
+/* Workers.c generated by valac 0.34.1, the Vala compiler
* generated from Workers.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/unit/Unit.c b/src/unit/Unit.c
index d652834..54f7d91 100644
--- a/src/unit/Unit.c
+++ b/src/unit/Unit.c
@@ -1,4 +1,4 @@
-/* Unit.c generated by valac 0.32.1, the Vala compiler
+/* Unit.c generated by valac 0.34.1, the Vala compiler
* generated from Unit.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/KeyValueMap.c b/src/util/KeyValueMap.c
index 003f0ca..f5ccf28 100644
--- a/src/util/KeyValueMap.c
+++ b/src/util/KeyValueMap.c
@@ -1,4 +1,4 @@
-/* KeyValueMap.c generated by valac 0.32.1, the Vala compiler
+/* KeyValueMap.c generated by valac 0.34.1, the Vala compiler
* generated from KeyValueMap.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -355,23 +355,23 @@ static gchar* double_to_string (gdouble self) {
const gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1__length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = g_ascii_dtostr (_tmp1_, G_ASCII_DTOSTR_BUF_SIZE, self);
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = g_strdup (_tmp2_);
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = (g_free (_tmp1_), NULL);
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 377 "KeyValueMap.c"
}
@@ -445,24 +445,24 @@ void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value)
static gchar* bool_to_string (gboolean self) {
gchar* result = NULL;
-#line 37 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (self) {
#line 451 "KeyValueMap.c"
gchar* _tmp0_ = NULL;
-#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup ("true");
-#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp0_;
-#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 459 "KeyValueMap.c"
} else {
gchar* _tmp1_ = NULL;
-#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_strdup ("false");
-#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 468 "KeyValueMap.c"
}
@@ -610,15 +610,15 @@ static gdouble double_parse (const gchar* str) {
gdouble result = 0.0;
const gchar* _tmp0_ = NULL;
gdouble _tmp1_ = 0.0;
-#line 869 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 869 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (str != NULL, 0.0);
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_ascii_strtod (_tmp0_, NULL);
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 624 "KeyValueMap.c"
}
@@ -731,21 +731,21 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
static gboolean bool_parse (const gchar* str) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
-#line 44 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 44 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (str != NULL, FALSE);
-#line 45 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 45 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (g_strcmp0 (_tmp0_, "true") == 0) {
-#line 46 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = TRUE;
-#line 46 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 745 "KeyValueMap.c"
} else {
-#line 48 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = FALSE;
-#line 48 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 751 "KeyValueMap.c"
}
diff --git a/src/util/Util.c b/src/util/Util.c
index ec9f4ff..dd62cd6 100644
--- a/src/util/Util.c
+++ b/src/util/Util.c
@@ -1,4 +1,4 @@
-/* Util.c generated by valac 0.32.1, the Vala compiler
+/* Util.c generated by valac 0.34.1, the Vala compiler
* generated from Util.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/file.c b/src/util/file.c
index b219fd2..b8f137f 100644
--- a/src/util/file.c
+++ b/src/util/file.c
@@ -1,4 +1,4 @@
-/* file.c generated by valac 0.32.1, the Vala compiler
+/* file.c generated by valac 0.34.1, the Vala compiler
* generated from file.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -411,37 +411,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 427 "file.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 435 "file.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 447 "file.c"
}
@@ -461,112 +461,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 471 "file.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 477 "file.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 481 "file.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 485 "file.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 497 "file.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 507 "file.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 513 "file.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 527 "file.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 537 "file.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 543 "file.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 552 "file.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 572 "file.c"
}
diff --git a/src/util/image.c b/src/util/image.c
index 2b415a8..36c03ad 100644
--- a/src/util/image.c
+++ b/src/util/image.c
@@ -1,4 +1,4 @@
-/* image.c generated by valac 0.32.1, the Vala compiler
+/* image.c generated by valac 0.34.1, the Vala compiler
* generated from image.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/misc.c b/src/util/misc.c
index b8101f1..282f51f 100644
--- a/src/util/misc.c
+++ b/src/util/misc.c
@@ -1,4 +1,4 @@
-/* misc.c generated by valac 0.32.1, the Vala compiler
+/* misc.c generated by valac 0.34.1, the Vala compiler
* generated from misc.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -687,7 +687,7 @@ gchar* md5_file (GFile* file, GError** error) {
#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp6__length1 = buffer_length1;
#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
- _tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_INPUT_STREAM, GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_);
+ _tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_);
#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
bytes_read = (gsize) _tmp7_;
#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -730,7 +730,7 @@ gchar* md5_file (GFile* file, GError** error) {
#line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp12_ = fins;
#line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
- g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
+ g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
#line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 737 "misc.c"
@@ -1971,35 +1971,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* _tmp3_ = NULL;
gint _tmp3__length1 = 0;
gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 2005 "misc.c"
}
@@ -3095,13 +3095,13 @@ void suppress_warnings (const gchar* log_domain, GLogLevelFlags log_levels, cons
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return;
#line 3107 "misc.c"
}
diff --git a/src/util/string.c b/src/util/string.c
index 4cfeedd..f2fe1cc 100644
--- a/src/util/string.c
+++ b/src/util/string.c
@@ -1,4 +1,4 @@
-/* string.c generated by valac 0.32.1, the Vala compiler
+/* string.c generated by valac 0.34.1, the Vala compiler
* generated from string.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -65,15 +65,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 79 "string.c"
}
@@ -614,19 +614,19 @@ static gchar* string_strip (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 632 "string.c"
}
@@ -639,25 +639,25 @@ static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar
const gchar* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
gchar _tmp3_ = '\0';
-#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (delimiters != NULL, NULL);
-#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = delimiters;
-#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = new_delimiter;
-#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strdelimit (_tmp1_, _tmp2_, _tmp3_);
-#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 663 "string.c"
}
@@ -895,33 +895,33 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
gunichar _tmp1_ = 0U;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 913 "string.c"
gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 921 "string.c"
} else {
-#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = -1;
-#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 927 "string.c"
}
@@ -956,35 +956,35 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
const gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 976 "string.c"
gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 984 "string.c"
} else {
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = -1;
-#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 990 "string.c"
}
@@ -1031,103 +1031,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
glong _tmp19_ = 0L;
glong _tmp20_ = 0L;
gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp2_ < ((glong) 0)) {
#line 1047 "string.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
start = _tmp3_ + _tmp4_;
#line 1056 "string.c"
}
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp5_ < ((glong) 0)) {
#line 1062 "string.c"
glong _tmp6_ = 0L;
glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp6_ + _tmp7_;
#line 1071 "string.c"
}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp9_ >= ((glong) 0)) {
#line 1077 "string.c"
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = _tmp10_ <= _tmp11_;
#line 1086 "string.c"
} else {
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = FALSE;
#line 1090 "string.c"
}
-#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp13_ >= ((glong) 0)) {
#line 1098 "string.c"
glong _tmp14_ = 0L;
glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ <= _tmp15_;
#line 1107 "string.c"
} else {
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
#line 1111 "string.c"
}
-#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp21_;
-#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1133 "string.c"
}
@@ -1221,35 +1221,35 @@ static gint string_last_index_of (const gchar* self, const gchar* needle, gint s
const gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = needle;
-#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 1241 "string.c"
gchar* _tmp4_ = NULL;
-#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1249 "string.c"
} else {
-#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = -1;
-#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1255 "string.c"
}
@@ -1325,33 +1325,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
gunichar _tmp1_ = 0U;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 1343 "string.c"
gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1351 "string.c"
} else {
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = -1;
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1357 "string.c"
}
@@ -1392,15 +1392,15 @@ static gunichar string_get_char (const gchar* self, glong index) {
gunichar result = 0U;
glong _tmp0_ = 0L;
gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1406 "string.c"
}
@@ -1537,54 +1537,54 @@ static gboolean string_get_next_char (const gchar* self, gint* index, gunichar*
gint _tmp0_ = 0;
gunichar _tmp1_ = 0U;
gunichar _tmp2_ = 0U;
-#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = *index;
-#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_vala_c = _tmp1_;
-#line 1107 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = _vala_c;
-#line 1107 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp2_ != ((gunichar) 0)) {
#line 1553 "string.c"
gint _tmp3_ = 0;
gchar* _tmp4_ = NULL;
-#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = *index;
-#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = g_utf8_next_char (((gchar*) self) + _tmp3_);
-#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*index = (gint) (_tmp4_ - ((gchar*) self));
-#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = TRUE;
-#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (c) {
-#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*c = _vala_c;
#line 1568 "string.c"
}
-#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1572 "string.c"
} else {
-#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = FALSE;
-#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (c) {
-#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*c = _vala_c;
#line 1580 "string.c"
}
-#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 1584 "string.c"
}
-#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (c) {
-#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*c = _vala_c;
#line 1590 "string.c"
}
diff --git a/src/util/system.c b/src/util/system.c
index cef9603..efb9d36 100644
--- a/src/util/system.c
+++ b/src/util/system.c
@@ -1,4 +1,4 @@
-/* system.c generated by valac 0.32.1, the Vala compiler
+/* system.c generated by valac 0.34.1, the Vala compiler
* generated from system.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/ui.c b/src/util/ui.c
index 44ba054..ac81527 100644
--- a/src/util/ui.c
+++ b/src/util/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.32.1, the Vala compiler
+/* ui.c generated by valac 0.34.1, the Vala compiler
* generated from ui.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.